-From 8dc3129826885706e51627f70113794e3f040ed0 Mon Sep 17 00:00:00 2001
+From 5a6ebcc56f3a8058eaba8db9f50da231a72f6e0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A5rten=20Kongstad?= <marten.kongstad@sonymobile.com>
Date: Tue, 15 Dec 2015 16:08:31 +0100
Subject: [PATCH 01/39] OMS7-N: Support tagging resources as OK to overlay
String8* pTargetPath, String8* pOverlayPath);
diff --git a/libs/androidfw/AssetManager.cpp b/libs/androidfw/AssetManager.cpp
-index 7d1424ef687..4c2f94d63ab 100644
+index 5b36a43abdc..c0e8a980c2d 100644
--- a/libs/androidfw/AssetManager.cpp
+++ b/libs/androidfw/AssetManager.cpp
@@ -252,7 +252,7 @@ bool AssetManager::addOverlayPath(const String8& packagePath, int32_t* cookie)
-From c8f9bc6207c9db6805446f41661fdd9345a6d924 Mon Sep 17 00:00:00 2001
+From 57ad0e2134adbb7ea094ca5b6d9398670fcacabf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A5rten=20Kongstad?= <marten.kongstad@sonymobile.com>
Date: Tue, 15 Dec 2015 16:40:23 +0100
Subject: [PATCH 02/39] OMS7-N: Introduce the OverlayManagerService [2/11]
-From 5d7e6ea290e2c8c080212193511dfe4989020332 Mon Sep 17 00:00:00 2001
+From fe60d2c99dc5f63cff87a87f43284b4f1d3d59b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A5rten=20Kongstad?= <marten.kongstad@sonymobile.com>
Date: Thu, 2 Jun 2016 09:35:31 +0200
Subject: [PATCH 03/39] OMS7-N: Integrate OverlayManagerService into framework
core/java/android/content/pm/PackageUserState.java | 6 +
core/jni/android_util_AssetManager.cpp | 95 ---------------
include/androidfw/AssetManager.h | 14 +--
- libs/androidfw/AssetManager.cpp | 111 -----------------
+ libs/androidfw/AssetManager.cpp | 112 -----------------
.../com/android/server/SystemServiceManager.java | 24 ++--
.../android/server/am/ActivityManagerService.java | 51 ++++++++
.../android/server/om/OverlayManagerService.java | 61 +++++-----
.../com/android/server/pm/PackageSettingBase.java | 8 +-
.../core/java/com/android/server/pm/Settings.java | 4 +-
services/java/com/android/server/SystemServer.java | 4 +
- 21 files changed, 335 insertions(+), 479 deletions(-)
+ 21 files changed, 335 insertions(+), 480 deletions(-)
diff --git a/cmds/idmap/Android.mk b/cmds/idmap/Android.mk
index 50ccb07a382..eb6da18ea0a 100644
private:
void closeZip(int idx);
diff --git a/libs/androidfw/AssetManager.cpp b/libs/androidfw/AssetManager.cpp
-index 4c2f94d63ab..b9954573d79 100644
+index c0e8a980c2d..b9954573d79 100644
--- a/libs/androidfw/AssetManager.cpp
+++ b/libs/androidfw/AssetManager.cpp
@@ -214,15 +214,6 @@ bool AssetManager::addAssetPath(
sharedRes = const_cast<AssetManager*>(this)->
mZipSet.setZipResourceTable(ap.path, sharedRes);
}
-@@ -772,65 +750,6 @@ Asset* AssetManager::openIdmapLocked(const struct asset_path& ap) const
+@@ -772,66 +750,6 @@ Asset* AssetManager::openIdmapLocked(const struct asset_path& ap) const
return ass;
}
- const_cast<AssetManager*>(this)->mZipSet.addOverlay(targetPackagePath, oap);
-
- oidmap->close();
+- delete oidmap;
- ALOGD("close idmap=%s pid=%d\n", oap.idmap.string(), getpid());
- }
-
const ResTable& AssetManager::getResources(bool required) const
{
const ResTable* rt = getResTable(required);
-@@ -1969,20 +1888,6 @@ bool AssetManager::SharedZip::isUpToDate()
+@@ -1970,20 +1888,6 @@ bool AssetManager::SharedZip::isUpToDate()
return mModWhen == modWhen;
}
AssetManager::SharedZip::~SharedZip()
{
if (kIsDebug) {
-@@ -2124,22 +2029,6 @@ bool AssetManager::ZipSet::isUpToDate()
+@@ -2125,22 +2029,6 @@ bool AssetManager::ZipSet::isUpToDate()
return true;
}
* Starts the specified boot phase for all system services that have been started up to
* this point.
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
-index e31b409598f..2822dc93d2b 100644
+index a3923b94ef9..f4d07aff3e6 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
-@@ -19297,6 +19297,57 @@ public final class ActivityManagerService extends ActivityManagerNative
+@@ -19344,6 +19344,57 @@ public final class ActivityManagerService extends ActivityManagerNative
}
/**
-From 982489be050f0b26b0871c1545a608cedbd64497 Mon Sep 17 00:00:00 2001
+From 2172f81b4862bb3f1af16e10ee2820225e58d853 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A5rten=20Kongstad?= <marten.kongstad@sonymobile.com>
Date: Mon, 25 Apr 2016 16:29:22 +0200
Subject: [PATCH 04/39] OMS7-N: Set EXTRA_REPLACING correctly in
-From f384d2dd985179f638384b8ffad71f791ebff489 Mon Sep 17 00:00:00 2001
+From 83d2b712ec875220cd540b606006923c317074d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A5rten=20Kongstad?= <marten.kongstad@sonymobile.com>
Date: Mon, 29 Feb 2016 14:12:35 +0100
Subject: [PATCH 05/39] OMS7-N: idmap: suppress print for padded resources
-From a511e7456e007b4b2783f78e7f3bdcdfc5686157 Mon Sep 17 00:00:00 2001
+From a279b95644ca149e43a27e5ddce3442f21ab3cd8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A5rten=20Kongstad?= <marten.kongstad@sonymobile.com>
Date: Thu, 2 Jun 2016 09:34:36 +0200
Subject: [PATCH 06/39] OMS7-N: Fix memory leak during idmap creation [6/11]
-From 0bf0a38a8adb2c37eb48bfc052d3307cd765943d Mon Sep 17 00:00:00 2001
+From 87dcc16198c2e09da5437a71764d2887ce54d577 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A5rten=20Kongstad?= <marten.kongstad@sonymobile.com>
Date: Thu, 2 Jun 2016 09:35:09 +0200
Subject: [PATCH 07/39] OMS7-N: installd: add command 'rmidmap' [7/11]
-From 1efd19a1d85b18a7d3a64d42fd7318bc3c611e1f Mon Sep 17 00:00:00 2001
+From 6e017f0b65c0d8287cb0cc04648531d0c610ba0c Mon Sep 17 00:00:00 2001
From: Josh Guilfoyle <Josh.Guilfoyle@T-Mobile.com>
Date: Wed, 26 Jan 2011 23:28:43 -0800
Subject: [PATCH 08/39] OMS7-N: Disable Zygote preloaded drawables [8/11]
-From 9c44db7a6126968c051a1fcfeeef7d3604b7b29c Mon Sep 17 00:00:00 2001
+From 3960a5b5d023fb9dbe06e468050ef34ebda41989 Mon Sep 17 00:00:00 2001
From: Nicholas Chum <nicholaschum@gmail.com>
Date: Sun, 19 Jun 2016 10:37:13 -0400
Subject: [PATCH 09/39] OMS7-N: Persistence on boot through
-From 80ac3c5bd7cda0c8621aec4864a6152b0687b35c Mon Sep 17 00:00:00 2001
+From 058ff6ae94fad5dd1e61cdfd33990c543998d3c7 Mon Sep 17 00:00:00 2001
From: Nicholas Chum <nicholaschum@gmail.com>
Date: Thu, 27 Oct 2016 07:08:00 +0200
Subject: [PATCH 10/39] OMS7-N: Do not enforce code policy limiting overlay
-From 222657694ae34a145284e35dda583805d3851ae2 Mon Sep 17 00:00:00 2001
+From 6f9205eb853edb1207387f70740422d1a2c77ec6 Mon Sep 17 00:00:00 2001
From: Jacob McSwain <jacob.a.mcswain@gmail.com>
Date: Sun, 26 Jun 2016 15:21:52 -0500
Subject: [PATCH 11/39] OMS7-N: Implement multi-target enable/disable and
-From 30faae7536ebb3d2879161ed8d0adde3bbaf1ebb Mon Sep 17 00:00:00 2001
+From 98990788c5ba17c772933302bb1cf3dd0877f78a Mon Sep 17 00:00:00 2001
From: Dave Kover <dkover@cyngn.com>
Date: Fri, 9 Dec 2016 10:47:17 -0700
Subject: [PATCH 12/39] Themes: Expose resolver hardcoded colors
-From 2626e4fd9102ccdb4b1abf2242dc98d67f9c5382 Mon Sep 17 00:00:00 2001
+From a7aed42d9fcaefe2d9a7432b18d164727d008f9d Mon Sep 17 00:00:00 2001
From: Nicholas Chum <nicholaschum@gmail.com>
Date: Tue, 17 Nov 2015 18:57:11 -0500
Subject: [PATCH 13/39] Themes: Allow Immersive cling colors to be fully themed
-From 7e132632f4317e887c9a4f0a7176d691a10d7e6a Mon Sep 17 00:00:00 2001
+From 6b3804b029990fb331b8f229d4a09001317df451 Mon Sep 17 00:00:00 2001
From: Nicholas Chum <nicholaschum@gmail.com>
Date: Mon, 23 Nov 2015 23:49:15 -0500
Subject: [PATCH 14/39] Themes: Allow Permission Icons to be fully themed
-From 115c01b1fb6ca51b5c7599618f0097c0f4b5853e Mon Sep 17 00:00:00 2001
+From f27876a051e7780aa031ce39b8890b83dd55c7ea Mon Sep 17 00:00:00 2001
From: Dave Kover <dkover@cyngn.com>
Date: Thu, 14 Apr 2016 10:19:13 +0700
Subject: [PATCH 15/39] Themes: Allow Navbar ripple color to be themed
-From 5dea0080ea8ddb30e3f13e415aee1aa8f1748524 Mon Sep 17 00:00:00 2001
+From 3258af269036de4cba47b317b02a7abc4b5c272d Mon Sep 17 00:00:00 2001
From: Ivan Iskandar <iiiiskandar14@gmail.com>
Date: Sun, 18 Sep 2016 21:33:18 +0700
Subject: [PATCH 16/39] SystemUI: Expose QS edit item decoration background
-From 98380a5481203bb3b1fc87c9858956de2adc740f Mon Sep 17 00:00:00 2001
+From 620674d634933b1b64c66977e05418ddd4aeecc0 Mon Sep 17 00:00:00 2001
From: Simao Gomes Viana <xdevs23@outlook.com>
Date: Fri, 25 Nov 2016 20:50:29 +0100
Subject: [PATCH 17/39] Allow custom alpha for notification shade bg color
-From 09d5a2a8420cb4b80e3bd5d5076573d8cd5f29ff Mon Sep 17 00:00:00 2001
+From 8e466672155f4f6724582f96eae445abfacdf03d Mon Sep 17 00:00:00 2001
From: "Niklas Schnettler (Sh4dowSoul)" <niklas.schnettler@gmail.com>
Date: Wed, 5 Oct 2016 18:07:43 +0200
Subject: [PATCH 18/39] Themes: Expose various QuickSettings text colors
-From b072c46400630130d11199c37dbcdc00f122188e Mon Sep 17 00:00:00 2001
+From 46949d05c49d62ef006ba386cd392476470e4a21 Mon Sep 17 00:00:00 2001
From: Nicholas Chum <nicholaschum@gmail.com>
Date: Sat, 27 Aug 2016 10:56:46 -0400
Subject: [PATCH 19/39] Notifications: Expose a bool to disable dynamic colors
-From 523b039278acdf5a7044b1e33af5844bde06cc51 Mon Sep 17 00:00:00 2001
+From be16740d88348db2f2842f1908cb7421d73dd625 Mon Sep 17 00:00:00 2001
From: George G <kreach3r@users.noreply.github.com>
Date: Mon, 14 Nov 2016 14:49:47 +0200
Subject: [PATCH 20/39] Notification dynamic colors bool compatible with OMS7
-From ec0c1b4b8f2088b531f5e28666ff2d2c536cd7eb Mon Sep 17 00:00:00 2001
+From 90b82c97a3d0796292f1af8b1160bf2380caadae Mon Sep 17 00:00:00 2001
From: Daniel Koman <dankoman30@gmail.com>
Date: Fri, 17 Apr 2015 11:56:28 -0600
Subject: [PATCH 21/39] Allow prevention of doze notification color inversion
-From 45f68624cd0345615aeffda1158d402ac7c5acac Mon Sep 17 00:00:00 2001
+From 639ec4b53d5e45a3af2570b1358b66b2b532a404 Mon Sep 17 00:00:00 2001
From: George G <kreach3r@users.noreply.github.com>
Date: Mon, 14 Nov 2016 14:44:17 +0200
Subject: [PATCH 22/39] OMS7 compatible 'Ambient notification inversion'
-From 4a9f18596e8c45c0dc17407039b730fbf173d03d Mon Sep 17 00:00:00 2001
+From dee05736aa6eaf39d58fe45c26a22c9b27c1851a Mon Sep 17 00:00:00 2001
From: Ivan Iskandar <iiiiskandar14@gmail.com>
Date: Mon, 5 Dec 2016 19:00:04 +0700
Subject: [PATCH 23/39] SystemUI: Use own drawables for QS expand icon
-From 5bfb6898a0b37ee4d1835fc31e39d83af78d8ff7 Mon Sep 17 00:00:00 2001
+From 7d856f5f2b292f031b79cab69ed2fa52e58e6579 Mon Sep 17 00:00:00 2001
From: 0xD34D <clark@scheffsblend.com>
Date: Mon, 9 Jan 2017 07:19:41 +0530
Subject: [PATCH 24/39] N-Extras: Add dynamic theme BootAnimation support
-From b2a5047293b699bad5b3402b4a89b9cade942bc7 Mon Sep 17 00:00:00 2001
+From b8b9d69b9d2bd3c73418202db1fcaad3a1cf42d6 Mon Sep 17 00:00:00 2001
From: 0xD34D <clark@scheffsblend.com>
Date: Wed, 22 Jun 2016 23:54:23 +0300
Subject: [PATCH 25/39] N-Extras: Add dynamic theme fonts support
protected void finalize() throws Throwable {
try {
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
-index 2822dc93d2b..ab010d4cb07 100644
+index f4d07aff3e6..5d8ab51d077 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
-@@ -512,6 +512,8 @@ public final class ActivityManagerService extends ActivityManagerNative
+@@ -513,6 +513,8 @@ public final class ActivityManagerService extends ActivityManagerNative
// as one line, but close enough for now.
static final int RESERVED_BYTES_PER_LOGCAT_LINE = 100;
// Access modes for handleIncomingUser.
static final int ALLOW_NON_FULL = 0;
static final int ALLOW_NON_FULL_IN_PROFILE = 1;
-@@ -3947,6 +3949,13 @@ public final class ActivityManagerService extends ActivityManagerNative
+@@ -3948,6 +3950,13 @@ public final class ActivityManagerService extends ActivityManagerNative
mNativeDebuggingApp = null;
}
String requiredAbi = (abiOverride != null) ? abiOverride : app.info.primaryCpuAbi;
if (requiredAbi == null) {
requiredAbi = Build.SUPPORTED_ABIS[0];
-@@ -3971,7 +3980,7 @@ public final class ActivityManagerService extends ActivityManagerNative
+@@ -3972,7 +3981,7 @@ public final class ActivityManagerService extends ActivityManagerNative
Process.ProcessStartResult startResult = Process.start(entryPoint,
app.processName, uid, uid, gids, debugFlags, mountExternal,
app.info.targetSdkVersion, app.info.seinfo, requiredAbi, instructionSet,
-From 053a5873c01639b5911dc0218b225a97d41e6517 Mon Sep 17 00:00:00 2001
+From a75f5eb1c3f793200f12fe0c38ce83019b1cd16e Mon Sep 17 00:00:00 2001
From: Nicholas Chum <nicholaschum@gmail.com>
Date: Sun, 17 Jul 2016 17:56:40 -0400
Subject: [PATCH 26/39] N-Extras: AudioService: Allow system effect sounds to
-From 82df27f007a1b852634bc305eafe044a7aa48736 Mon Sep 17 00:00:00 2001
+From 8b7b718ac2fde41d72737f1d364d20657f707bf6 Mon Sep 17 00:00:00 2001
From: George G <kreach3r@users.noreply.github.com>
Date: Mon, 4 Jul 2016 06:25:15 +0300
Subject: [PATCH 27/39] OMS7-N: ApplicationsState: add filter for Substratum
-From c9f5177b9a4614f0cd5602993839050fae0fa643 Mon Sep 17 00:00:00 2001
+From 178a421cc2a72774eaae4385e358e1787f09c778 Mon Sep 17 00:00:00 2001
From: Kuba Schenk <abukcz@gmail.com>
Date: Thu, 1 Dec 2016 21:48:26 +0100
Subject: [PATCH 28/39] OMS7-N: ApplicationsState: add filter for Substratum
-From edb54e92df68678b2d3b7178c2e23b1f890972da Mon Sep 17 00:00:00 2001
+From be60352faad7f72bb88d0907ffe5320a3014dd3d Mon Sep 17 00:00:00 2001
From: Abdulwahab Isam <abdoi94.iq@gmail.com>
Date: Fri, 7 Oct 2016 08:30:11 +0300
Subject: [PATCH 29/39] Themes: Expose QS battery
-From 3f3902d3bae9bc8cb3c304580ea69936cb0edd9c Mon Sep 17 00:00:00 2001
+From 1675e81a9c5532f111fd5fb1d00d795d9b0f1b76 Mon Sep 17 00:00:00 2001
From: bigrushdog <randall.rushing@gmail.com>
Date: Mon, 19 Dec 2016 04:33:31 -0800
Subject: [PATCH 30/39] OMS: Introduce MODIFY_OVERLAYS permission for user apps
-From 49d41589da4ae6d7229cde9fa3bf7c9679788e45 Mon Sep 17 00:00:00 2001
+From 92c569669b916a82eb8b7983514e49cb5d2b6281 Mon Sep 17 00:00:00 2001
From: daveyannihilation <daveyannihilation@hotmail.com>
Date: Sun, 1 Jan 2017 01:47:53 -0700
Subject: [PATCH 31/39] SystemUI: Expose switch bar title
-From 9eeec9c55f7509b89963a5fe36c3d274d871ab60 Mon Sep 17 00:00:00 2001
+From d80560dcf8cf991fdcf82b2bc444132569479ba4 Mon Sep 17 00:00:00 2001
From: Bryan Owens <djbryan3540@gmail.com>
Date: Fri, 6 Jan 2017 21:12:15 +0800
Subject: [PATCH 32/39] Themes: Expose manifest styles for themes
-From 96b9021830fde7f2544016d5c51c16a076a49484 Mon Sep 17 00:00:00 2001
+From 0a70fdf65bc1b133dba034705797b7ad7e454b8b Mon Sep 17 00:00:00 2001
From: mickybart <mickybart@pygoscelis.org>
Date: Sat, 19 Nov 2016 19:05:05 -0500
Subject: [PATCH 33/39] OMS: StrictMode and files under /data/system/theme/
-From 29d865f6db1f5ea6d6866831943ead4382a958bb Mon Sep 17 00:00:00 2001
+From 48bd8aff219c57d1f578d0c7568bc91b47032323 Mon Sep 17 00:00:00 2001
From: Daniel Koman <dankoman30@gmail.com>
Date: Wed, 28 Sep 2016 15:28:26 +0200
Subject: [PATCH 34/39] doze: allow grayscale even if invert boolean is false
-From 344ae621e0b9fea43506d99b7fb12e95414f7825 Mon Sep 17 00:00:00 2001
+From 5d2305c7564bb7ea1d4dda47ca09267173dfcb1f Mon Sep 17 00:00:00 2001
From: Alex Cruz <mazdarider23@gmail.com>
Date: Tue, 24 Jan 2017 11:14:46 +0100
Subject: [PATCH 35/39] Expose external qs tile tint color
-From 4160deefa178641c4ad0a04d4666e2f1f5032d79 Mon Sep 17 00:00:00 2001
+From 2594471d446539bc66928f7238ca89de2d585431 Mon Sep 17 00:00:00 2001
From: George G <kreach3r@users.noreply.github.com>
Date: Thu, 2 Feb 2017 01:52:27 +0200
Subject: [PATCH 36/39] graphics: ADB "N" icon compatible with OMS7
-From 7c68e1ec39a7031020eaaadebdb0aee86f48cec1 Mon Sep 17 00:00:00 2001
+From 2d6fcbfe3de3fef2a22112ad440a23064f06c5e6 Mon Sep 17 00:00:00 2001
From: Alex Cruz <mazdarider23@gmail.com>
Date: Sat, 4 Feb 2017 14:13:26 +0100
Subject: [PATCH 37/39] Set external QS tiles tint mode to SRC_ATOP
-From 4bfd7364e528492112373eb81ae4ff97a42658f0 Mon Sep 17 00:00:00 2001
+From d1b0b4f215177c59bf20e85e58a8e0c9f4cb7af4 Mon Sep 17 00:00:00 2001
From: Branden M <wasabi.dev@gmail.com>
Date: Wed, 1 Feb 2017 22:22:45 -0600
Subject: [PATCH 38/39] Themes: Expose Keyguard affordance circle background
-From f0e66274ad4cc5f8adc34ccb07db3162f11a35f8 Mon Sep 17 00:00:00 2001
+From 0a948ee14244742c52baa94bf32e04a7db0f3751 Mon Sep 17 00:00:00 2001
From: bigrushdog <randall.rushing@gmail.com>
Date: Sat, 14 Jan 2017 23:33:38 -0800
Subject: [PATCH 39/39] Add a protected broadcast for Masquerade events