From: LuK1337 Date: Tue, 28 Mar 2017 18:23:37 +0000 (+0200) Subject: Sync patches with LineageOMS changes X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c53e5313778e8cfd9f825fcd298f9c1e99bfdc6f;p=GitHub%2FStricted%2Fandroid_vendor_extra.git Sync patches with LineageOMS changes --- diff --git a/patches/frameworks/base/0001-OMS7-N-Support-tagging-resources-as-OK-to-overlay-1-.patch b/patches/frameworks/base/0001-OMS7-N-Support-tagging-resources-as-OK-to-overlay-1-.patch index 962c8f4..dcc9e13 100644 --- a/patches/frameworks/base/0001-OMS7-N-Support-tagging-resources-as-OK-to-overlay-1-.patch +++ b/patches/frameworks/base/0001-OMS7-N-Support-tagging-resources-as-OK-to-overlay-1-.patch @@ -1,7 +1,7 @@ -From 45cf60053ab74bf9d59c7a0c2d62696dd0478ef0 Mon Sep 17 00:00:00 2001 +From d6b3f93bec61769fab7ebf31e78bf0acb42bb2e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Kongstad?= Date: Tue, 15 Dec 2015 16:08:31 +0100 -Subject: [PATCH 01/45] OMS7-N: Support tagging resources as OK to overlay +Subject: [PATCH 01/42] OMS7-N: Support tagging resources as OK to overlay [1/11] This will allow applications to have a resource xml defining what @@ -33,7 +33,7 @@ Change-Id: I08d11de845c1679017798ea1636ef4c36f820d8e 7 files changed, 164 insertions(+), 15 deletions(-) diff --git a/cmds/idmap/create.cpp b/cmds/idmap/create.cpp -index c13d318f744..8656b0e0e5f 100644 +index c13d318..8656b0e 100644 --- a/cmds/idmap/create.cpp +++ b/cmds/idmap/create.cpp @@ -106,7 +106,7 @@ fail: @@ -46,7 +46,7 @@ index c13d318f744..8656b0e0e5f 100644 return true; } diff --git a/cmds/idmap/inspect.cpp b/cmds/idmap/inspect.cpp -index f6afc859430..924090fbb9d 100644 +index f6afc85..924090f 100644 --- a/cmds/idmap/inspect.cpp +++ b/cmds/idmap/inspect.cpp @@ -192,6 +192,12 @@ namespace { @@ -63,7 +63,7 @@ index f6afc859430..924090fbb9d 100644 err = buf.nextUint32(&i); diff --git a/include/androidfw/ResourceTypes.h b/include/androidfw/ResourceTypes.h -index 12a6b0f9a4e..6094a576d75 100644 +index 12a6b0f..6094a57 100644 --- a/include/androidfw/ResourceTypes.h +++ b/include/androidfw/ResourceTypes.h @@ -1382,7 +1382,11 @@ struct ResTable_entry @@ -97,7 +97,7 @@ index 12a6b0f9a4e..6094a576d75 100644 String8* pTargetPath, String8* pOverlayPath); diff --git a/libs/androidfw/AssetManager.cpp b/libs/androidfw/AssetManager.cpp -index 5b36a43abdc..c0e8a980c2d 100644 +index 5b36a43..c0e8a98 100644 --- a/libs/androidfw/AssetManager.cpp +++ b/libs/androidfw/AssetManager.cpp @@ -252,7 +252,7 @@ bool AssetManager::addOverlayPath(const String8& packagePath, int32_t* cookie) @@ -110,7 +110,7 @@ index 5b36a43abdc..c0e8a980c2d 100644 delete idmap; return false; diff --git a/libs/androidfw/ResourceTypes.cpp b/libs/androidfw/ResourceTypes.cpp -index e8c6fcf03a5..022f19efe86 100644 +index e8c6fcf..022f19e 100644 --- a/libs/androidfw/ResourceTypes.cpp +++ b/libs/androidfw/ResourceTypes.cpp @@ -59,7 +59,7 @@ namespace android { @@ -197,7 +197,7 @@ index e8c6fcf03a5..022f19efe86 100644 if (inclValues) { diff --git a/tools/aapt/ResourceTable.cpp b/tools/aapt/ResourceTable.cpp -index a1b1879e745..b2d04802bf1 100644 +index a1b1879..b2d0480 100644 --- a/tools/aapt/ResourceTable.cpp +++ b/tools/aapt/ResourceTable.cpp @@ -800,6 +800,7 @@ status_t compileResourceFile(Bundle* bundle, @@ -367,7 +367,7 @@ index a1b1879e745..b2d04802bf1 100644 : mName(name), mPackageId(packageId), mTypeStringsMapping(0xffffffff), diff --git a/tools/aapt/ResourceTable.h b/tools/aapt/ResourceTable.h -index 54d56cfc26f..7e9b04429cc 100644 +index 54d56cf..7e9b044 100644 --- a/tools/aapt/ResourceTable.h +++ b/tools/aapt/ResourceTable.h @@ -139,6 +139,11 @@ public: @@ -470,5 +470,5 @@ index 54d56cfc26f..7e9b04429cc 100644 Vector > mOrderedConfigs; SortedVector mCanAddEntries; -- -2.11.1 +2.9.3 diff --git a/patches/frameworks/base/0002-OMS7-N-Introduce-the-OverlayManagerService-2-11.patch b/patches/frameworks/base/0002-OMS7-N-Introduce-the-OverlayManagerService-2-11.patch index 3b8e958..c1d09b4 100644 --- a/patches/frameworks/base/0002-OMS7-N-Introduce-the-OverlayManagerService-2-11.patch +++ b/patches/frameworks/base/0002-OMS7-N-Introduce-the-OverlayManagerService-2-11.patch @@ -1,7 +1,7 @@ -From 32041002c96bbeb5dcffa3beef7114c597abffae Mon Sep 17 00:00:00 2001 +From 7cfd3aa15db2d7da9c7e0420cec8669c361e65cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Kongstad?= Date: Tue, 15 Dec 2015 16:40:23 +0100 -Subject: [PATCH 02/45] OMS7-N: Introduce the OverlayManagerService [2/11] +Subject: [PATCH 02/42] OMS7-N: Introduce the OverlayManagerService [2/11] Add a new system service to manage Runtime Resource Overlays. This will offload the PackageManagerService and allow administration of overlay @@ -84,7 +84,7 @@ Change-Id: Icc3c7daa25345d20bc5014b865024422eab72f5b create mode 100644 services/core/java/com/android/server/om/OverlayManagerShellCommand.java diff --git a/Android.mk b/Android.mk -index bdb45550fa1..df427801fa7 100644 +index bdb4555..df42780 100644 --- a/Android.mk +++ b/Android.mk @@ -137,6 +137,7 @@ LOCAL_SRC_FILES += \ @@ -96,7 +96,7 @@ index bdb45550fa1..df427801fa7 100644 core/java/android/content/pm/IOnAppsChangedListener.aidl \ core/java/android/content/pm/IOtaDexopt.aidl \ diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java -index 3a2f471e96e..1ca44e0f633 100644 +index 3a2f471..1ca44e0 100644 --- a/core/java/android/content/Context.java +++ b/core/java/android/content/Context.java @@ -3656,6 +3656,16 @@ public abstract class Context { @@ -117,7 +117,7 @@ index 3a2f471e96e..1ca44e0f633 100644 * process and user ID running in the system. * diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java -index 861aae5a879..1afae798bcf 100644 +index 861aae5..1afae79 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -3092,6 +3092,40 @@ public class Intent implements Parcelable, Cloneable { @@ -163,7 +163,7 @@ index 861aae5a879..1afae798bcf 100644 * {@link DocumentsProvider} instances installed on the device, letting the diff --git a/core/java/android/content/om/IOverlayManager.aidl b/core/java/android/content/om/IOverlayManager.aidl new file mode 100644 -index 00000000000..4f5d96038d1 +index 0000000..4f5d960 --- /dev/null +++ b/core/java/android/content/om/IOverlayManager.aidl @@ -0,0 +1,129 @@ @@ -298,7 +298,7 @@ index 00000000000..4f5d96038d1 +} diff --git a/core/java/android/content/om/OverlayInfo.aidl b/core/java/android/content/om/OverlayInfo.aidl new file mode 100644 -index 00000000000..e7d413d0775 +index 0000000..e7d413d --- /dev/null +++ b/core/java/android/content/om/OverlayInfo.aidl @@ -0,0 +1,19 @@ @@ -323,7 +323,7 @@ index 00000000000..e7d413d0775 +parcelable OverlayInfo; diff --git a/core/java/android/content/om/OverlayInfo.java b/core/java/android/content/om/OverlayInfo.java new file mode 100644 -index 00000000000..a25cf0c008c +index 0000000..a25cf0c --- /dev/null +++ b/core/java/android/content/om/OverlayInfo.java @@ -0,0 +1,290 @@ @@ -618,7 +618,7 @@ index 00000000000..a25cf0c008c + } +} diff --git a/core/java/android/content/pm/PackageManagerInternal.java b/core/java/android/content/pm/PackageManagerInternal.java -index f5bcf64417a..bdbdd1ebcf9 100644 +index f5bcf64..bdbdd1e 100644 --- a/core/java/android/content/pm/PackageManagerInternal.java +++ b/core/java/android/content/pm/PackageManagerInternal.java @@ -168,4 +168,28 @@ public abstract class PackageManagerInternal { @@ -651,7 +651,7 @@ index f5bcf64417a..bdbdd1ebcf9 100644 + public abstract void setResourceDirs(int userId, String packageName, String[] resourceDirs); } diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml -index 2c76dee9754..6a5bd3946db 100644 +index 2c76dee..6a5bd39 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -84,6 +84,10 @@ @@ -667,7 +667,7 @@ index 2c76dee9754..6a5bd3946db 100644 diff --git a/services/core/java/com/android/server/om/IdmapManager.java b/services/core/java/com/android/server/om/IdmapManager.java new file mode 100644 -index 00000000000..e2a37750ef3 +index 0000000..e2a3775 --- /dev/null +++ b/services/core/java/com/android/server/om/IdmapManager.java @@ -0,0 +1,116 @@ @@ -789,7 +789,7 @@ index 00000000000..e2a37750ef3 +} diff --git a/services/core/java/com/android/server/om/OverlayManagerService.java b/services/core/java/com/android/server/om/OverlayManagerService.java new file mode 100644 -index 00000000000..ec148dd9fa7 +index 0000000..ec148dd --- /dev/null +++ b/services/core/java/com/android/server/om/OverlayManagerService.java @@ -0,0 +1,901 @@ @@ -1696,7 +1696,7 @@ index 00000000000..ec148dd9fa7 +} diff --git a/services/core/java/com/android/server/om/OverlayManagerServiceImpl.java b/services/core/java/com/android/server/om/OverlayManagerServiceImpl.java new file mode 100644 -index 00000000000..2a0d88b416d +index 0000000..2a0d88b --- /dev/null +++ b/services/core/java/com/android/server/om/OverlayManagerServiceImpl.java @@ -0,0 +1,478 @@ @@ -2180,7 +2180,7 @@ index 00000000000..2a0d88b416d +} diff --git a/services/core/java/com/android/server/om/OverlayManagerSettings.java b/services/core/java/com/android/server/om/OverlayManagerSettings.java new file mode 100644 -index 00000000000..af0bb64bd67 +index 0000000..af0bb64 --- /dev/null +++ b/services/core/java/com/android/server/om/OverlayManagerSettings.java @@ -0,0 +1,656 @@ @@ -2842,7 +2842,7 @@ index 00000000000..af0bb64bd67 +} diff --git a/services/core/java/com/android/server/om/OverlayManagerShellCommand.java b/services/core/java/com/android/server/om/OverlayManagerShellCommand.java new file mode 100644 -index 00000000000..d6f53737913 +index 0000000..d6f5373 --- /dev/null +++ b/services/core/java/com/android/server/om/OverlayManagerShellCommand.java @@ -0,0 +1,179 @@ @@ -3026,10 +3026,10 @@ index 00000000000..d6f53737913 + } +} diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java -index 5a06bb341cd..cfc5a0edd5c 100644 +index 4cfa3d5..7860bbd 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java -@@ -21450,6 +21450,47 @@ Slog.v(TAG, ":: stepped forward, applying functor at tag " + parser.getName()); +@@ -21460,6 +21460,47 @@ Slog.v(TAG, ":: stepped forward, applying functor at tag " + parser.getName()); return mSettings.wasPackageEverLaunchedLPr(packageName, userId); } } @@ -3078,5 +3078,5 @@ index 5a06bb341cd..cfc5a0edd5c 100644 @Override -- -2.11.1 +2.9.3 diff --git a/patches/frameworks/base/0003-OMS7-N-Integrate-OverlayManagerService-into-framewor.patch b/patches/frameworks/base/0003-OMS7-N-Integrate-OverlayManagerService-into-framewor.patch index b266694..3214cae 100644 --- a/patches/frameworks/base/0003-OMS7-N-Integrate-OverlayManagerService-into-framewor.patch +++ b/patches/frameworks/base/0003-OMS7-N-Integrate-OverlayManagerService-into-framewor.patch @@ -1,7 +1,7 @@ -From 2ad001347cfee56ced3c7515d42db82181ba2db8 Mon Sep 17 00:00:00 2001 +From f6bfedb67fced7d53d515b73bb4730215c2dc9e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Kongstad?= Date: Thu, 2 Jun 2016 09:35:31 +0200 -Subject: [PATCH 03/45] OMS7-N: Integrate OverlayManagerService into framework +Subject: [PATCH 03/42] OMS7-N: Integrate OverlayManagerService into framework [3/11] Hand over ownership of overlays to OverlayManagerService. @@ -51,21 +51,21 @@ Change-Id: If0b1eaa690c38f9c33f7c8dc981314205a73fa9c core/java/android/app/IApplicationThread.java | 2 + core/java/android/app/ResourcesManager.java | 119 ++++++++++++++---- core/java/android/content/pm/PackageParser.java | 20 +-- - core/java/android/content/pm/PackageUserState.java | 6 + + core/java/android/content/pm/PackageUserState.java | 7 +- core/jni/android_util_AssetManager.cpp | 95 --------------- - include/androidfw/AssetManager.h | 14 +-- + include/androidfw/AssetManager.h | 15 +-- libs/androidfw/AssetManager.cpp | 112 ----------------- .../com/android/server/SystemServiceManager.java | 24 ++-- .../android/server/am/ActivityManagerService.java | 51 ++++++++ .../android/server/om/OverlayManagerService.java | 61 +++++----- .../android/server/pm/PackageManagerService.java | 134 ++++----------------- - .../com/android/server/pm/PackageSettingBase.java | 8 +- + .../com/android/server/pm/PackageSettingBase.java | 9 +- .../core/java/com/android/server/pm/Settings.java | 4 +- services/java/com/android/server/SystemServer.java | 4 + - 21 files changed, 335 insertions(+), 480 deletions(-) + 21 files changed, 337 insertions(+), 481 deletions(-) diff --git a/cmds/idmap/Android.mk b/cmds/idmap/Android.mk -index 50ccb07a382..eb6da18ea0a 100644 +index 50ccb07..eb6da18 100644 --- a/cmds/idmap/Android.mk +++ b/cmds/idmap/Android.mk @@ -15,7 +15,7 @@ @@ -78,7 +78,7 @@ index 50ccb07a382..eb6da18ea0a 100644 LOCAL_SHARED_LIBRARIES := liblog libutils libandroidfw diff --git a/cmds/idmap/idmap.cpp b/cmds/idmap/idmap.cpp -index 3ab19155362..d388977e8e2 100644 +index 3ab1915..d388977 100644 --- a/cmds/idmap/idmap.cpp +++ b/cmds/idmap/idmap.cpp @@ -13,8 +13,6 @@ SYNOPSIS \n\ @@ -172,7 +172,7 @@ index 3ab19155362..d388977e8e2 100644 return maybe_inspect(argv[2]); } diff --git a/cmds/idmap/idmap.h b/cmds/idmap/idmap.h -index 8d4210bcb44..5914de96a99 100644 +index 8d4210b..5914de9 100644 --- a/cmds/idmap/idmap.h +++ b/cmds/idmap/idmap.h @@ -25,12 +25,6 @@ int idmap_create_path(const char *target_apk_path, const char *overlay_apk_path, @@ -189,7 +189,7 @@ index 8d4210bcb44..5914de96a99 100644 #endif // _IDMAP_H_ diff --git a/core/java/android/app/ActivityManagerNative.java b/core/java/android/app/ActivityManagerNative.java -index 50479c8e951..389f3422fb5 100644 +index 50479c8..389f342 100644 --- a/core/java/android/app/ActivityManagerNative.java +++ b/core/java/android/app/ActivityManagerNative.java @@ -16,6 +16,7 @@ @@ -244,7 +244,7 @@ index 50479c8e951..389f3422fb5 100644 throws RemoteException { Parcel data = Parcel.obtain(); diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java -index 2d22f26069f..55fc25de68b 100644 +index 2d22f26..55fc25d 100644 --- a/core/java/android/app/ActivityThread.java +++ b/core/java/android/app/ActivityThread.java @@ -897,6 +897,14 @@ public final class ActivityThread { @@ -328,7 +328,7 @@ index 2d22f26069f..55fc25de68b 100644 if (configDiff != 0) { // Ask text layout engine to free its caches if there is a locale change diff --git a/core/java/android/app/ApplicationThreadNative.java b/core/java/android/app/ApplicationThreadNative.java -index 05d9d7e412f..47b05eee470 100644 +index 05d9d7e..47b05ee 100644 --- a/core/java/android/app/ApplicationThreadNative.java +++ b/core/java/android/app/ApplicationThreadNative.java @@ -16,6 +16,7 @@ @@ -374,7 +374,7 @@ index 05d9d7e412f..47b05eee470 100644 Parcel data = Parcel.obtain(); data.writeInterfaceToken(IApplicationThread.descriptor); diff --git a/core/java/android/app/IActivityManager.java b/core/java/android/app/IActivityManager.java -index 5a4470b2ecd..c7522b9fc55 100644 +index 5a4470b..c7522b9 100644 --- a/core/java/android/app/IActivityManager.java +++ b/core/java/android/app/IActivityManager.java @@ -266,6 +266,7 @@ public interface IActivityManager extends IInterface { @@ -392,7 +392,7 @@ index 5a4470b2ecd..c7522b9fc55 100644 + int UPDATE_ASSETS_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION + 381; } diff --git a/core/java/android/app/IApplicationThread.java b/core/java/android/app/IApplicationThread.java -index 3fa88ae674a..fcc97e3d719 100644 +index 3fa88ae..fcc97e3 100644 --- a/core/java/android/app/IApplicationThread.java +++ b/core/java/android/app/IApplicationThread.java @@ -104,6 +104,7 @@ public interface IApplicationThread extends IInterface { @@ -410,7 +410,7 @@ index 3fa88ae674a..fcc97e3d719 100644 + int SCHEDULE_ASSETS_CHANGED_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+61; } diff --git a/core/java/android/app/ResourcesManager.java b/core/java/android/app/ResourcesManager.java -index 4916c1c1f5c..8cbca31a66c 100644 +index 4916c1c..8cbca31 100644 --- a/core/java/android/app/ResourcesManager.java +++ b/core/java/android/app/ResourcesManager.java @@ -29,6 +29,7 @@ import android.content.res.ResourcesImpl; @@ -566,7 +566,7 @@ index 4916c1c1f5c..8cbca31a66c 100644 } } diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java -index f2e3333b67d..8d42d2c590c 100644 +index f2e3333..77b70135f 100644 --- a/core/java/android/content/pm/PackageParser.java +++ b/core/java/android/content/pm/PackageParser.java @@ -668,10 +668,9 @@ public class PackageParser { @@ -617,16 +617,16 @@ index f2e3333b67d..8d42d2c590c 100644 /** * Data used to feed the KeySetManagerService -@@ -5455,6 +5442,7 @@ public class PackageParser { - ai.enabled = false; - } - ai.enabledSetting = state.enabled; -+ ai.resourceDirs = state.resourceDirs; +@@ -5458,6 +5445,7 @@ public class PackageParser { if (state.protectedComponents != null) { ai.protect = state.protectedComponents.size() > 0; } ++ ai.resourceDirs = state.resourceDirs; + } + + public static ApplicationInfo generateApplicationInfo(Package p, int flags, diff --git a/core/java/android/content/pm/PackageUserState.java b/core/java/android/content/pm/PackageUserState.java -index e64e4c4cc5e..4b276fb786f 100644 +index e64e4c4..8357395 100644 --- a/core/java/android/content/pm/PackageUserState.java +++ b/core/java/android/content/pm/PackageUserState.java @@ -31,6 +31,8 @@ import android.util.ArraySet; @@ -647,17 +647,18 @@ index e64e4c4cc5e..4b276fb786f 100644 public PackageUserState() { installed = true; hidden = false; -@@ -76,6 +80,8 @@ public class PackageUserState { - appLinkGeneration = o.appLinkGeneration; - disabledComponents = ArrayUtils.cloneOrNull(o.disabledComponents); - enabledComponents = ArrayUtils.cloneOrNull(o.enabledComponents); -+ resourceDirs = -+ o.resourceDirs == null ? null : Arrays.copyOf(o.resourceDirs, o.resourceDirs.length); - protectedComponents = o.protectedComponents != null +@@ -80,7 +84,8 @@ public class PackageUserState { ? new ArraySet(o.protectedComponents) : null; visibleComponents = o.visibleComponents != null + ? new ArraySet(o.visibleComponents) : null; +- ++ resourceDirs = ++ o.resourceDirs == null ? null : Arrays.copyOf(o.resourceDirs, o.resourceDirs.length); + } + + /** diff --git a/core/jni/android_util_AssetManager.cpp b/core/jni/android_util_AssetManager.cpp -index 1a7294f1424..6c5a88fa827 100644 +index 1a7294f..6c5a88f 100644 --- a/core/jni/android_util_AssetManager.cpp +++ b/core/jni/android_util_AssetManager.cpp @@ -129,85 +129,6 @@ jint copyValue(JNIEnv* env, jobject outValue, const ResTable* table, @@ -770,7 +771,7 @@ index 1a7294f1424..6c5a88fa827 100644 if (am == NULL) { jniThrowException(env, "java/lang/OutOfMemoryError", ""); diff --git a/include/androidfw/AssetManager.h b/include/androidfw/AssetManager.h -index 2d5f4c2f90b..c4991032b73 100644 +index 2d5f4c2..0326e2b 100644 --- a/include/androidfw/AssetManager.h +++ b/include/androidfw/AssetManager.h @@ -238,12 +238,10 @@ public: @@ -816,17 +817,19 @@ index 2d5f4c2f90b..c4991032b73 100644 static Mutex gLock; static DefaultKeyedVector > gOpen; }; -@@ -357,8 +347,6 @@ private: +@@ -357,9 +347,8 @@ private: bool isUpToDate(); - void addOverlay(const String8& path, const asset_path& overlay); - bool getOverlay(const String8& path, size_t idx, asset_path* out) const; void closeZipFromPath(const String8& zip); ++ private: void closeZip(int idx); + diff --git a/libs/androidfw/AssetManager.cpp b/libs/androidfw/AssetManager.cpp -index c0e8a980c2d..b9954573d79 100644 +index c0e8a98..b995457 100644 --- a/libs/androidfw/AssetManager.cpp +++ b/libs/androidfw/AssetManager.cpp @@ -214,15 +214,6 @@ bool AssetManager::addAssetPath( @@ -984,7 +987,7 @@ index c0e8a980c2d..b9954573d79 100644 * Compute the zip file's index. * diff --git a/services/core/java/com/android/server/SystemServiceManager.java b/services/core/java/com/android/server/SystemServiceManager.java -index 90f507c146b..904c967acdc 100644 +index 90f507c..904c967 100644 --- a/services/core/java/com/android/server/SystemServiceManager.java +++ b/services/core/java/com/android/server/SystemServiceManager.java @@ -16,6 +16,7 @@ @@ -1032,7 +1035,7 @@ index 90f507c146b..904c967acdc 100644 * 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 a3923b94ef9..f4d07aff3e6 100644 +index a3923b9..f4d07af 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -19344,6 +19344,57 @@ public final class ActivityManagerService extends ActivityManagerNative @@ -1094,7 +1097,7 @@ index a3923b94ef9..f4d07aff3e6 100644 * crash, etc dialogs. The idea is that if there is no affordence to * press the on-screen buttons, or the user experience would be more diff --git a/services/core/java/com/android/server/om/OverlayManagerService.java b/services/core/java/com/android/server/om/OverlayManagerService.java -index ec148dd9fa7..761ef5240ec 100644 +index ec148dd..761ef52 100644 --- a/services/core/java/com/android/server/om/OverlayManagerService.java +++ b/services/core/java/com/android/server/om/OverlayManagerService.java @@ -676,37 +676,36 @@ public final class OverlayManagerService extends SystemService { @@ -1166,7 +1169,7 @@ index ec148dd9fa7..761ef5240ec 100644 private void schedulePersistSettings() { diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java -index cfc5a0edd5c..89549231806 100644 +index 7860bbd..1d9a590 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -400,17 +400,16 @@ public class PackageManagerService extends IPackageManager.Stub { @@ -1208,7 +1211,7 @@ index cfc5a0edd5c..89549231806 100644 /** * Tracks new system packages [received in an OTA] that we expect to * find updated user-installed versions. Keys are package name, values -@@ -2344,8 +2339,8 @@ public class PackageManagerService extends IPackageManager.Stub { +@@ -2347,8 +2342,8 @@ public class PackageManagerService extends IPackageManager.Stub { File vendorOverlayDir = new File(VENDOR_OVERLAY_DIR); scanDirTracedLI(vendorOverlayDir, mDefParseFlags | PackageParser.PARSE_IS_SYSTEM @@ -1219,7 +1222,7 @@ index cfc5a0edd5c..89549231806 100644 // Find base frameworks (resource packages without code). scanDirTracedLI(frameworkDir, mDefParseFlags -@@ -2402,7 +2397,7 @@ public class PackageManagerService extends IPackageManager.Stub { +@@ -2405,7 +2400,7 @@ public class PackageManagerService extends IPackageManager.Stub { // Collect overlay in /system/vendor scanDirLI(new File(RegionalizationSystemDir, "vendor/overlay"), PackageParser.PARSE_IS_SYSTEM | PackageParser.PARSE_IS_SYSTEM_DIR, @@ -1228,7 +1231,7 @@ index cfc5a0edd5c..89549231806 100644 } } -@@ -6729,60 +6724,6 @@ public class PackageManagerService extends IPackageManager.Stub { +@@ -6732,60 +6727,6 @@ public class PackageManagerService extends IPackageManager.Stub { return finalList; } @@ -1289,7 +1292,7 @@ index cfc5a0edd5c..89549231806 100644 private void scanDirTracedLI(File dir, final int parseFlags, int scanFlags, long currentTime) { Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "scanDir"); try { -@@ -6970,10 +6911,6 @@ public class PackageManagerService extends IPackageManager.Stub { +@@ -6973,10 +6914,6 @@ public class PackageManagerService extends IPackageManager.Stub { pp.setOnlyPowerOffAlarmApps(mOnlyPowerOffAlarm); pp.setDisplayMetrics(mMetrics); @@ -1300,7 +1303,7 @@ index cfc5a0edd5c..89549231806 100644 Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "parsePackage"); final PackageParser.Package pkg; try { -@@ -8206,7 +8143,6 @@ public class PackageManagerService extends IPackageManager.Stub { +@@ -8209,7 +8146,6 @@ public class PackageManagerService extends IPackageManager.Stub { pkg.applicationInfo.privateFlags &= ~ApplicationInfo.PRIVATE_FLAG_DIRECT_BOOT_AWARE; } @@ -1308,7 +1311,7 @@ index cfc5a0edd5c..89549231806 100644 if ((policyFlags&PackageParser.PARSE_IS_PRIVILEGED) != 0) { pkg.applicationInfo.privateFlags |= ApplicationInfo.PRIVATE_FLAG_PRIVILEGED; -@@ -8801,7 +8737,6 @@ public class PackageManagerService extends IPackageManager.Stub { +@@ -8804,7 +8740,6 @@ public class PackageManagerService extends IPackageManager.Stub { // writer Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "updateSettings"); @@ -1316,7 +1319,7 @@ index cfc5a0edd5c..89549231806 100644 synchronized (mPackages) { // We don't expect installation to fail beyond this point -@@ -9148,36 +9083,10 @@ public class PackageManagerService extends IPackageManager.Stub { +@@ -9151,36 +9086,10 @@ public class PackageManagerService extends IPackageManager.Stub { } pkgSetting.setTimeStamp(scanFileTime); @@ -1353,7 +1356,7 @@ index cfc5a0edd5c..89549231806 100644 return pkg; } -@@ -16624,7 +16533,7 @@ public class PackageManagerService extends IPackageManager.Stub { +@@ -16627,7 +16536,7 @@ public class PackageManagerService extends IPackageManager.Stub { false /*hidden*/, false /*suspended*/, null, null, null, false /*blockUninstall*/, ps.readUserState(nextUserId).domainVerificationStatus, 0, @@ -1362,7 +1365,7 @@ index cfc5a0edd5c..89549231806 100644 } } -@@ -21482,14 +21391,13 @@ Slog.v(TAG, ":: stepped forward, applying functor at tag " + parser.getName()); +@@ -21492,14 +21401,13 @@ Slog.v(TAG, ":: stepped forward, applying functor at tag " + parser.getName()); @Override public void setResourceDirs(int userId, String packageName, String[] resourceDirs) { @@ -1385,7 +1388,7 @@ index cfc5a0edd5c..89549231806 100644 } diff --git a/services/core/java/com/android/server/pm/PackageSettingBase.java b/services/core/java/com/android/server/pm/PackageSettingBase.java -index 75427a8b75a..18c79cdda69 100644 +index 75427a8..d0c7f25 100644 --- a/services/core/java/com/android/server/pm/PackageSettingBase.java +++ b/services/core/java/com/android/server/pm/PackageSettingBase.java @@ -21,6 +21,7 @@ import static android.content.pm.PackageManager.COMPONENT_ENABLED_STATE_DISABLED @@ -1396,24 +1399,25 @@ index 75427a8b75a..18c79cdda69 100644 import android.content.pm.IntentFilterVerificationInfo; import android.content.pm.PackageManager; import android.content.pm.PackageUserState; -@@ -379,7 +380,7 @@ abstract class PackageSettingBase extends SettingBase { - boolean notLaunched, boolean hidden, boolean suspended, +@@ -380,7 +381,8 @@ abstract class PackageSettingBase extends SettingBase { String lastDisableAppCaller, ArraySet enabledComponents, ArraySet disabledComponents, boolean blockUninstall, int domainVerifState, -- int linkGeneration, -+ int linkGeneration, String[] resourceDirs, - ArraySet protectedComponents, ArraySet visibleComponents) { + int linkGeneration, +- ArraySet protectedComponents, ArraySet visibleComponents) { ++ ArraySet protectedComponents, ArraySet visibleComponents, ++ String[] resourceDirs) { PackageUserState state = modifyUserState(userId); state.ceDataInode = ceDataInode; -@@ -395,6 +396,7 @@ abstract class PackageSettingBase extends SettingBase { - state.blockUninstall = blockUninstall; - state.domainVerificationStatus = domainVerifState; + state.enabled = enabled; +@@ -397,6 +399,7 @@ abstract class PackageSettingBase extends SettingBase { state.appLinkGeneration = linkGeneration; -+ state.resourceDirs = resourceDirs; state.protectedComponents = protectedComponents; state.visibleComponents = visibleComponents; ++ state.resourceDirs = resourceDirs; } -@@ -455,6 +457,10 @@ abstract class PackageSettingBase extends SettingBase { + + ArraySet getEnabledComponents(int userId) { +@@ -455,6 +458,10 @@ abstract class PackageSettingBase extends SettingBase { modifyUserStateComponents(userId, false, true).enabledComponents.add(componentClassName); } @@ -1425,7 +1429,7 @@ index 75427a8b75a..18c79cdda69 100644 PackageUserState state = modifyUserStateComponents(userId, false, true); boolean changed = state.disabledComponents != null diff --git a/services/core/java/com/android/server/pm/Settings.java b/services/core/java/com/android/server/pm/Settings.java -index 285b5bbf3ec..2b36e0e0e4d 100755 +index 285b5bb..f00080c 100755 --- a/services/core/java/com/android/server/pm/Settings.java +++ b/services/core/java/com/android/server/pm/Settings.java @@ -813,6 +813,7 @@ final class Settings { @@ -1444,17 +1448,17 @@ index 285b5bbf3ec..2b36e0e0e4d 100755 null ); } -@@ -1726,7 +1728,7 @@ final class Settings { - +@@ -1727,7 +1729,7 @@ final class Settings { ps.setUserState(userId, ceDataInode, enabled, installed, stopped, notLaunched, hidden, suspended, enabledCaller, enabledComponents, disabledComponents, -- blockUninstall, verifState, linkGeneration, -+ blockUninstall, verifState, linkGeneration, null, - protectedComponents, visibleComponents); + blockUninstall, verifState, linkGeneration, +- protectedComponents, visibleComponents); ++ protectedComponents, visibleComponents, null); } else if (tagName.equals("preferred-activities")) { readPreferredActivitiesLPw(parser, userId); + } else if (tagName.equals(TAG_PERSISTENT_PREFERRED_ACTIVITIES)) { diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java -index 6f2141708ed..ab425c05e95 100644 +index 6f21417..ab425c0 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -85,6 +85,7 @@ import com.android.server.media.projection.MediaProjectionManagerService; @@ -1476,5 +1480,5 @@ index 6f2141708ed..ab425c05e95 100644 // service, and permissions service, therefore we start it after them. startSensorService(); -- -2.11.1 +2.9.3 diff --git a/patches/frameworks/base/0004-OMS7-N-Set-EXTRA_REPLACING-correctly-in-ACTION_PACKA.patch b/patches/frameworks/base/0004-OMS7-N-Set-EXTRA_REPLACING-correctly-in-ACTION_PACKA.patch index aef281b..edac750 100644 --- a/patches/frameworks/base/0004-OMS7-N-Set-EXTRA_REPLACING-correctly-in-ACTION_PACKA.patch +++ b/patches/frameworks/base/0004-OMS7-N-Set-EXTRA_REPLACING-correctly-in-ACTION_PACKA.patch @@ -1,7 +1,7 @@ -From ed383d26424a1787cbd06629d0b71a6858eb970d Mon Sep 17 00:00:00 2001 +From c55ae74be951a94f19d9e2f97b2f74156dabe718 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Kongstad?= Date: Mon, 25 Apr 2016 16:29:22 +0200 -Subject: [PATCH 04/45] OMS7-N: Set EXTRA_REPLACING correctly in +Subject: [PATCH 04/42] OMS7-N: Set EXTRA_REPLACING correctly in ACTION_PACKAGE_ADDED [4/11] When broadcasting ACTION_PACKAGE_ADDED the recipients of the Intent are @@ -35,10 +35,10 @@ Change-Id: Icf869013d5d652de4bf0f6df4529b7a68d35a25c 1 file changed, 1 insertion(+) diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java -index 89549231806..3abcdbb19d2 100644 +index 1d9a590..f1dfbae 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java -@@ -1715,6 +1715,7 @@ public class PackageManagerService extends IPackageManager.Stub { +@@ -1718,6 +1718,7 @@ public class PackageManagerService extends IPackageManager.Stub { // Send added for users that don't see the package for the first time if (update) { @@ -47,5 +47,5 @@ index 89549231806..3abcdbb19d2 100644 } sendPackageBroadcast(Intent.ACTION_PACKAGE_ADDED, packageName, -- -2.11.1 +2.9.3 diff --git a/patches/frameworks/base/0005-OMS7-N-idmap-suppress-print-for-padded-resources-5-1.patch b/patches/frameworks/base/0005-OMS7-N-idmap-suppress-print-for-padded-resources-5-1.patch index 6fd73bc..cb06a20 100644 --- a/patches/frameworks/base/0005-OMS7-N-idmap-suppress-print-for-padded-resources-5-1.patch +++ b/patches/frameworks/base/0005-OMS7-N-idmap-suppress-print-for-padded-resources-5-1.patch @@ -1,7 +1,7 @@ -From f8889f2970a1abd1c4847035a6eda28a06486c3f Mon Sep 17 00:00:00 2001 +From cca20e72b03339f1084d69dc89d13d96bd2529df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Kongstad?= Date: Mon, 29 Feb 2016 14:12:35 +0100 -Subject: [PATCH 05/45] OMS7-N: idmap: suppress print for padded resources +Subject: [PATCH 05/42] OMS7-N: idmap: suppress print for padded resources [5/11] Change-Id: I565ccf515068b96927e4317cc9c06543415bb324 @@ -10,7 +10,7 @@ Change-Id: I565ccf515068b96927e4317cc9c06543415bb324 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cmds/idmap/inspect.cpp b/cmds/idmap/inspect.cpp -index 924090fbb9d..cb52a394427 100644 +index 924090f..cb52a39 100644 --- a/cmds/idmap/inspect.cpp +++ b/cmds/idmap/inspect.cpp @@ -289,7 +289,9 @@ namespace { @@ -25,5 +25,5 @@ index 924090fbb9d..cb52a394427 100644 } -- -2.11.1 +2.9.3 diff --git a/patches/frameworks/base/0006-OMS7-N-Fix-memory-leak-during-idmap-creation-6-11.patch b/patches/frameworks/base/0006-OMS7-N-Fix-memory-leak-during-idmap-creation-6-11.patch index c8f3975..ecb7285 100644 --- a/patches/frameworks/base/0006-OMS7-N-Fix-memory-leak-during-idmap-creation-6-11.patch +++ b/patches/frameworks/base/0006-OMS7-N-Fix-memory-leak-during-idmap-creation-6-11.patch @@ -1,7 +1,7 @@ -From 3f8902d99fc8e7b1d3d294349db065ed71f46936 Mon Sep 17 00:00:00 2001 +From 1a29f1792ba225dd491f43d3ade34ee6366ea4c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Kongstad?= Date: Thu, 2 Jun 2016 09:34:36 +0200 -Subject: [PATCH 06/45] OMS7-N: Fix memory leak during idmap creation [6/11] +Subject: [PATCH 06/42] OMS7-N: Fix memory leak during idmap creation [6/11] Plug a memory leak in AssetManager::createIdmap. @@ -11,7 +11,7 @@ Change-Id: Ieed805c596df931e2167ebb47c1b2907d6bf67f4 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/libs/androidfw/AssetManager.cpp b/libs/androidfw/AssetManager.cpp -index b9954573d79..ef580e386ab 100644 +index b995457..ef580e3 100644 --- a/libs/androidfw/AssetManager.cpp +++ b/libs/androidfw/AssetManager.cpp @@ -291,22 +291,34 @@ bool AssetManager::createIdmap(const char* targetApkPath, const char* overlayApk @@ -63,5 +63,5 @@ index b9954573d79..ef580e386ab 100644 bool AssetManager::addDefaultAssets() -- -2.11.1 +2.9.3 diff --git a/patches/frameworks/base/0007-OMS7-N-installd-add-command-rmidmap-7-11.patch b/patches/frameworks/base/0007-OMS7-N-installd-add-command-rmidmap-7-11.patch index 1b66ed9..96dc6f3 100644 --- a/patches/frameworks/base/0007-OMS7-N-installd-add-command-rmidmap-7-11.patch +++ b/patches/frameworks/base/0007-OMS7-N-installd-add-command-rmidmap-7-11.patch @@ -1,7 +1,7 @@ -From 77e70e046ea44a3fe57af2c53747f16d37df4c0b Mon Sep 17 00:00:00 2001 +From 7c06a1ac96cdbd3cd0bf68813edee118adc6338d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Kongstad?= Date: Thu, 2 Jun 2016 09:35:09 +0200 -Subject: [PATCH 07/45] OMS7-N: installd: add command 'rmidmap' [7/11] +Subject: [PATCH 07/42] OMS7-N: installd: add command 'rmidmap' [7/11] Add an installd command to remove an idmap file. This is the inverse of the 'idmap' command and is intended for clean-up once an idmap file is @@ -16,7 +16,7 @@ Change-Id: I58f55f643da99c0bd69136ee43c1c8c70c352797 1 file changed, 7 insertions(+) diff --git a/services/core/java/com/android/server/pm/Installer.java b/services/core/java/com/android/server/pm/Installer.java -index 2e18b1c417f..7f618b8134b 100644 +index 2e18b1c..7f618b8 100644 --- a/services/core/java/com/android/server/pm/Installer.java +++ b/services/core/java/com/android/server/pm/Installer.java @@ -170,6 +170,13 @@ public final class Installer extends SystemService { @@ -34,5 +34,5 @@ index 2e18b1c417f..7f618b8134b 100644 assertValidInstructionSet(instructionSet); mInstaller.execute("rmdex", codePath, instructionSet); -- -2.11.1 +2.9.3 diff --git a/patches/frameworks/base/0008-OMS7-N-Disable-Zygote-preloaded-drawables-8-11.patch b/patches/frameworks/base/0008-OMS7-N-Disable-Zygote-preloaded-drawables-8-11.patch index 2d9332f..e7e6404 100644 --- a/patches/frameworks/base/0008-OMS7-N-Disable-Zygote-preloaded-drawables-8-11.patch +++ b/patches/frameworks/base/0008-OMS7-N-Disable-Zygote-preloaded-drawables-8-11.patch @@ -1,7 +1,7 @@ -From 30a80a1bc345caab58ccaf5e00c460ed43604540 Mon Sep 17 00:00:00 2001 +From 8ba04dc55f9be19336dfba92db5b9761b7ef4828 Mon Sep 17 00:00:00 2001 From: Josh Guilfoyle Date: Wed, 26 Jan 2011 23:28:43 -0800 -Subject: [PATCH 08/45] OMS7-N: Disable Zygote preloaded drawables [8/11] +Subject: [PATCH 08/42] OMS7-N: Disable Zygote preloaded drawables [8/11] With a theme applied, most of these preloaded drawables go unused. Any assets the theme has redirected will need to be loaded with each app @@ -19,7 +19,7 @@ Change-Id: I253b1a22482ac664c196533a4c2fcd88ae84b996 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/java/com/android/internal/os/ZygoteInit.java b/core/java/com/android/internal/os/ZygoteInit.java -index 20f84b52d19..455849e0c19 100644 +index 20f84b5..455849e 100644 --- a/core/java/com/android/internal/os/ZygoteInit.java +++ b/core/java/com/android/internal/os/ZygoteInit.java @@ -108,7 +108,7 @@ public class ZygoteInit { @@ -41,5 +41,5 @@ index 20f84b52d19..455849e0c19 100644 mResources.finishPreloading(); } catch (RuntimeException e) { -- -2.11.1 +2.9.3 diff --git a/patches/frameworks/base/0009-OMS7-N-Persistence-on-boot-through-OverlayManagerSer.patch b/patches/frameworks/base/0009-OMS7-N-Persistence-on-boot-through-OverlayManagerSer.patch index 7e7d844..bc06f2a 100644 --- a/patches/frameworks/base/0009-OMS7-N-Persistence-on-boot-through-OverlayManagerSer.patch +++ b/patches/frameworks/base/0009-OMS7-N-Persistence-on-boot-through-OverlayManagerSer.patch @@ -1,7 +1,7 @@ -From 5a3a75f20bb450999384f8a3d5bf91eb6f921ad5 Mon Sep 17 00:00:00 2001 +From 86352b365ebc436025efd731970432fd4b5e9493 Mon Sep 17 00:00:00 2001 From: Nicholas Chum Date: Sun, 19 Jun 2016 10:37:13 -0400 -Subject: [PATCH 09/45] OMS7-N: Persistence on boot through +Subject: [PATCH 09/42] OMS7-N: Persistence on boot through OverlayManagerServiceImpl [9/11] Overlays should not be enforced by the traditional OverlayManagerService @@ -14,7 +14,7 @@ Change-Id: Ic6eeb38b5e7bcec4211405d4504ba37a75738227 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/services/core/java/com/android/server/om/OverlayManagerServiceImpl.java b/services/core/java/com/android/server/om/OverlayManagerServiceImpl.java -index 2a0d88b416d..4c6196824cf 100644 +index 2a0d88b..4c61968 100644 --- a/services/core/java/com/android/server/om/OverlayManagerServiceImpl.java +++ b/services/core/java/com/android/server/om/OverlayManagerServiceImpl.java @@ -402,34 +402,45 @@ final class OverlayManagerServiceImpl { @@ -74,5 +74,5 @@ index 2a0d88b416d..4c6196824cf 100644 private void removeIdmapIfPossible(@NonNull final OverlayInfo oi) { -- -2.11.1 +2.9.3 diff --git a/patches/frameworks/base/0010-OMS7-N-Do-not-enforce-code-policy-limiting-overlay-i.patch b/patches/frameworks/base/0010-OMS7-N-Do-not-enforce-code-policy-limiting-overlay-i.patch index e6fb589..a7af494 100644 --- a/patches/frameworks/base/0010-OMS7-N-Do-not-enforce-code-policy-limiting-overlay-i.patch +++ b/patches/frameworks/base/0010-OMS7-N-Do-not-enforce-code-policy-limiting-overlay-i.patch @@ -1,7 +1,7 @@ -From b3f1d015b1582b75c0d6c447d99fa2972a03f890 Mon Sep 17 00:00:00 2001 +From aaa0557792eacf970fa7a1288e7d3aacce1f9a38 Mon Sep 17 00:00:00 2001 From: Nicholas Chum Date: Thu, 27 Oct 2016 07:08:00 +0200 -Subject: [PATCH 10/45] OMS7-N: Do not enforce code policy limiting overlay +Subject: [PATCH 10/42] OMS7-N: Do not enforce code policy limiting overlay installation [10/11] Change-Id: Iea317f3771f25dbfcbf4938e88cace12fd97d7eb @@ -10,10 +10,10 @@ Change-Id: Iea317f3771f25dbfcbf4938e88cace12fd97d7eb 1 file changed, 4 deletions(-) diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java -index 3abcdbb19d2..faaff1f08a2 100644 +index f1dfbae..a57b79a 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java -@@ -8149,10 +8149,6 @@ public class PackageManagerService extends IPackageManager.Stub { +@@ -8152,10 +8152,6 @@ public class PackageManagerService extends IPackageManager.Stub { pkg.applicationInfo.privateFlags |= ApplicationInfo.PRIVATE_FLAG_PRIVILEGED; } @@ -25,5 +25,5 @@ index 3abcdbb19d2..faaff1f08a2 100644 mCustomResolverComponentName.getPackageName().equals(pkg.packageName)) { setUpCustomResolverActivity(pkg); -- -2.11.1 +2.9.3 diff --git a/patches/frameworks/base/0011-OMS7-N-Implement-multi-target-enable-disable-and-dis.patch b/patches/frameworks/base/0011-OMS7-N-Implement-multi-target-enable-disable-and-dis.patch index 55fb6c7..9ab6a47 100644 --- a/patches/frameworks/base/0011-OMS7-N-Implement-multi-target-enable-disable-and-dis.patch +++ b/patches/frameworks/base/0011-OMS7-N-Implement-multi-target-enable-disable-and-dis.patch @@ -1,7 +1,7 @@ -From 7eb82b22b707e5a090ad1b6070621fdf8d2cfca8 Mon Sep 17 00:00:00 2001 +From 06bfbbb1324d1d492c3ea5a72d3d502acd5fa584 Mon Sep 17 00:00:00 2001 From: Jacob McSwain Date: Sun, 26 Jun 2016 15:21:52 -0500 -Subject: [PATCH 11/45] OMS7-N: Implement multi-target enable/disable and +Subject: [PATCH 11/42] OMS7-N: Implement multi-target enable/disable and disable-all [11/11] Just use the enable option like normal, but you can add more arguments @@ -27,7 +27,7 @@ Change-Id: I04a595084a87b8260b5c534c4f5f111adbe154d7 5 files changed, 161 insertions(+), 44 deletions(-) diff --git a/core/java/android/content/om/IOverlayManager.aidl b/core/java/android/content/om/IOverlayManager.aidl -index 4f5d96038d1..8e349dcf6ca 100644 +index 4f5d960..8e349dc 100644 --- a/core/java/android/content/om/IOverlayManager.aidl +++ b/core/java/android/content/om/IOverlayManager.aidl @@ -83,10 +83,12 @@ interface IOverlayManager { @@ -56,7 +56,7 @@ index 4f5d96038d1..8e349dcf6ca 100644 + void refresh(in int uid); } diff --git a/services/core/java/com/android/server/om/OverlayManagerService.java b/services/core/java/com/android/server/om/OverlayManagerService.java -index 761ef5240ec..deb9046a2d4 100644 +index 761ef52..deb9046 100644 --- a/services/core/java/com/android/server/om/OverlayManagerService.java +++ b/services/core/java/com/android/server/om/OverlayManagerService.java @@ -255,7 +255,7 @@ public final class OverlayManagerService extends SystemService { @@ -178,7 +178,7 @@ index 761ef5240ec..deb9046a2d4 100644 final boolean updateFrameworkRes = targetPackageNames.contains("android"); if (updateFrameworkRes) { diff --git a/services/core/java/com/android/server/om/OverlayManagerServiceImpl.java b/services/core/java/com/android/server/om/OverlayManagerServiceImpl.java -index 4c6196824cf..c5156403b3f 100644 +index 4c61968..c515640 100644 --- a/services/core/java/com/android/server/om/OverlayManagerServiceImpl.java +++ b/services/core/java/com/android/server/om/OverlayManagerServiceImpl.java @@ -324,7 +324,7 @@ final class OverlayManagerServiceImpl { @@ -222,7 +222,7 @@ index 4c6196824cf..c5156403b3f 100644 } diff --git a/services/core/java/com/android/server/om/OverlayManagerSettings.java b/services/core/java/com/android/server/om/OverlayManagerSettings.java -index af0bb64bd67..935ea02890b 100644 +index af0bb64..935ea02 100644 --- a/services/core/java/com/android/server/om/OverlayManagerSettings.java +++ b/services/core/java/com/android/server/om/OverlayManagerSettings.java @@ -76,7 +76,7 @@ final class OverlayManagerSettings { @@ -321,7 +321,7 @@ index af0bb64bd67..935ea02890b 100644 } diff --git a/services/core/java/com/android/server/om/OverlayManagerShellCommand.java b/services/core/java/com/android/server/om/OverlayManagerShellCommand.java -index d6f53737913..44004c140a4 100644 +index d6f5373..44004c1 100644 --- a/services/core/java/com/android/server/om/OverlayManagerShellCommand.java +++ b/services/core/java/com/android/server/om/OverlayManagerShellCommand.java @@ -25,8 +25,10 @@ import android.os.ShellCommand; @@ -466,5 +466,5 @@ index d6f53737913..44004c140a4 100644 private int runSetPriority() throws RemoteException { -- -2.11.1 +2.9.3 diff --git a/patches/frameworks/base/0012-Themes-Expose-resolver-hardcoded-colors.patch b/patches/frameworks/base/0012-Themes-Expose-resolver-hardcoded-colors.patch index 97ab285..ba16d38 100644 --- a/patches/frameworks/base/0012-Themes-Expose-resolver-hardcoded-colors.patch +++ b/patches/frameworks/base/0012-Themes-Expose-resolver-hardcoded-colors.patch @@ -1,7 +1,7 @@ -From e428fe8691ab5d97c72ba1dc87a27611c49d64ef Mon Sep 17 00:00:00 2001 +From 7b1552ee2ed76963296292ea14612993a31f9500 Mon Sep 17 00:00:00 2001 From: Dave Kover Date: Fri, 9 Dec 2016 10:47:17 -0700 -Subject: [PATCH 12/45] Themes: Expose resolver hardcoded colors +Subject: [PATCH 12/42] Themes: Expose resolver hardcoded colors commit dbbd5e70cc65002df41561474b03362022dd6716 Author: Dave Kover @@ -56,7 +56,7 @@ Change-Id: Iec7951147bbbc99aee6b06ae50c1acc7b9c01a7f create mode 100644 core/res/res/values/projekt_colors.xml diff --git a/core/res/res/layout/chooser_grid.xml b/core/res/res/layout/chooser_grid.xml -index d8dd447e6a7..78c2e05f372 100644 +index d8dd447..78c2e05 100644 --- a/core/res/res/layout/chooser_grid.xml +++ b/core/res/res/layout/chooser_grid.xml @@ -31,7 +31,7 @@ @@ -87,7 +87,7 @@ index d8dd447e6a7..78c2e05f372 100644 android:padding="32dp" android:gravity="center" diff --git a/core/res/res/layout/resolver_different_item_header.xml b/core/res/res/layout/resolver_different_item_header.xml -index 58891363e20..201c8c686fe 100644 +index 5889136..201c8c6 100644 --- a/core/res/res/layout/resolver_different_item_header.xml +++ b/core/res/res/layout/resolver_different_item_header.xml @@ -29,6 +29,6 @@ @@ -99,7 +99,7 @@ index 58891363e20..201c8c686fe 100644 android:elevation="8dp" /> diff --git a/core/res/res/layout/resolver_list.xml b/core/res/res/layout/resolver_list.xml -index c4e8e9cb63b..1b6230a5a09 100644 +index c4e8e9c..1b6230a 100644 --- a/core/res/res/layout/resolver_list.xml +++ b/core/res/res/layout/resolver_list.xml @@ -30,7 +30,7 @@ @@ -139,7 +139,7 @@ index c4e8e9cb63b..1b6230a5a09 100644 android:paddingBottom="8dp" android:paddingStart="12dp" diff --git a/core/res/res/layout/resolver_list_with_default.xml b/core/res/res/layout/resolver_list_with_default.xml -index 02dc2ede430..d3baf682fe0 100644 +index 02dc2ed..d3baf68 100644 --- a/core/res/res/layout/resolver_list_with_default.xml +++ b/core/res/res/layout/resolver_list_with_default.xml @@ -29,7 +29,7 @@ @@ -171,7 +171,7 @@ index 02dc2ede430..d3baf682fe0 100644 android:divider="@null" /> diff --git a/core/res/res/values/projekt_colors.xml b/core/res/res/values/projekt_colors.xml new file mode 100644 -index 00000000000..c6dbc1ca1c9 +index 0000000..c6dbc1c --- /dev/null +++ b/core/res/res/values/projekt_colors.xml @@ -0,0 +1,20 @@ @@ -196,5 +196,5 @@ index 00000000000..c6dbc1ca1c9 + @color/white + -- -2.11.1 +2.9.3 diff --git a/patches/frameworks/base/0013-Themes-Allow-Immersive-cling-colors-to-be-fully-them.patch b/patches/frameworks/base/0013-Themes-Allow-Immersive-cling-colors-to-be-fully-them.patch index 6249d14..67f6f41 100644 --- a/patches/frameworks/base/0013-Themes-Allow-Immersive-cling-colors-to-be-fully-them.patch +++ b/patches/frameworks/base/0013-Themes-Allow-Immersive-cling-colors-to-be-fully-them.patch @@ -1,7 +1,7 @@ -From fcb7a4329a95e2edc29986b27720b514a7235017 Mon Sep 17 00:00:00 2001 +From 2ecc0b5270d86d0a9af8aacc246d8aaa68267649 Mon Sep 17 00:00:00 2001 From: Nicholas Chum Date: Tue, 17 Nov 2015 18:57:11 -0500 -Subject: [PATCH 13/45] Themes: Allow Immersive cling colors to be fully themed +Subject: [PATCH 13/42] Themes: Allow Immersive cling colors to be fully themed This allows the immersive mode help tooltip to be themed completely by removing hardcoded framework calls. Let the themer decide what they want @@ -14,7 +14,7 @@ Change-Id: Ia0927fda5e44a3ce8ef699cb018bea9b9e7ace62 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/core/res/res/layout/immersive_mode_cling.xml b/core/res/res/layout/immersive_mode_cling.xml -index b08b0f4d59c..6dbde20d481 100644 +index b08b0f4..6dbde20 100644 --- a/core/res/res/layout/immersive_mode_cling.xml +++ b/core/res/res/layout/immersive_mode_cling.xml @@ -16,7 +16,7 @@ @@ -65,7 +65,7 @@ index b08b0f4d59c..6dbde20d481 100644 \ No newline at end of file + diff --git a/core/res/res/values/projekt_colors.xml b/core/res/res/values/projekt_colors.xml -index c6dbc1ca1c9..7408ae99682 100644 +index c6dbc1c..7408ae9 100644 --- a/core/res/res/values/projekt_colors.xml +++ b/core/res/res/values/projekt_colors.xml @@ -17,4 +17,7 @@ @@ -77,5 +77,5 @@ index c6dbc1ca1c9..7408ae99682 100644 + @android:color/white -- -2.11.1 +2.9.3 diff --git a/patches/frameworks/base/0014-Themes-Allow-Permission-Icons-to-be-fully-themed.patch b/patches/frameworks/base/0014-Themes-Allow-Permission-Icons-to-be-fully-themed.patch index 6d89bff..458ea81 100644 --- a/patches/frameworks/base/0014-Themes-Allow-Permission-Icons-to-be-fully-themed.patch +++ b/patches/frameworks/base/0014-Themes-Allow-Permission-Icons-to-be-fully-themed.patch @@ -1,7 +1,7 @@ -From d4e7c67ed53aed6475555c7ed5bf6660aa92fcd3 Mon Sep 17 00:00:00 2001 +From 6ad7fce1c7b6e8f5f9fe5110d711a461862427d0 Mon Sep 17 00:00:00 2001 From: Nicholas Chum Date: Mon, 23 Nov 2015 23:49:15 -0500 -Subject: [PATCH 14/45] Themes: Allow Permission Icons to be fully themed +Subject: [PATCH 14/42] Themes: Allow Permission Icons to be fully themed This removes the forced @android:color/black tint on the permission icons during app sideload through PackageInstaller. @@ -17,7 +17,7 @@ Change-Id: I31eb5021a6d297997dbba156f98cbf47f2102b6c 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/core/res/res/layout/app_permission_item.xml b/core/res/res/layout/app_permission_item.xml -index 383d771074e..a80d40efd2b 100644 +index 383d771..a80d40e 100644 --- a/core/res/res/layout/app_permission_item.xml +++ b/core/res/res/layout/app_permission_item.xml @@ -32,7 +32,7 @@ @@ -30,7 +30,7 @@ index 383d771074e..a80d40efd2b 100644 @android:color/black -- -2.11.1 +2.9.3 diff --git a/patches/frameworks/base/0015-Themes-Allow-Navbar-ripple-color-to-be-themed.patch b/patches/frameworks/base/0015-Themes-Allow-Navbar-ripple-color-to-be-themed.patch index 07c8810..be8de07 100644 --- a/patches/frameworks/base/0015-Themes-Allow-Navbar-ripple-color-to-be-themed.patch +++ b/patches/frameworks/base/0015-Themes-Allow-Navbar-ripple-color-to-be-themed.patch @@ -1,7 +1,7 @@ -From 88b94c2fb97f178d8c56ab85fbbbdb074d525011 Mon Sep 17 00:00:00 2001 +From 8876a0aa62178dc7585af7708c2d6223bd370c1a Mon Sep 17 00:00:00 2001 From: Dave Kover Date: Thu, 14 Apr 2016 10:19:13 +0700 -Subject: [PATCH 15/45] Themes: Allow Navbar ripple color to be themed +Subject: [PATCH 15/42] Themes: Allow Navbar ripple color to be themed PS1: Layers Commit by @setiawanjimmy @@ -18,7 +18,7 @@ Change-Id: I7969e952d7e08f1d12e89291512312421585b70f diff --git a/packages/SystemUI/res/values/projekt_colors.xml b/packages/SystemUI/res/values/projekt_colors.xml new file mode 100644 -index 00000000000..a0f1df06b6a +index 0000000..a0f1df0 --- /dev/null +++ b/packages/SystemUI/res/values/projekt_colors.xml @@ -0,0 +1,21 @@ @@ -44,7 +44,7 @@ index 00000000000..a0f1df06b6a + #FFFFFFFF + diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonRipple.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonRipple.java -index 57e092a2603..2579579b0e7 100644 +index 57e092a..2579579 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonRipple.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonRipple.java @@ -65,16 +65,19 @@ public class KeyButtonRipple extends Drawable { @@ -69,5 +69,5 @@ index 57e092a2603..2579579b0e7 100644 return mRipplePaint; } -- -2.11.1 +2.9.3 diff --git a/patches/frameworks/base/0016-SystemUI-Expose-QS-edit-item-decoration-background-c.patch b/patches/frameworks/base/0016-SystemUI-Expose-QS-edit-item-decoration-background-c.patch index 162918e..6e7b46a 100644 --- a/patches/frameworks/base/0016-SystemUI-Expose-QS-edit-item-decoration-background-c.patch +++ b/patches/frameworks/base/0016-SystemUI-Expose-QS-edit-item-decoration-background-c.patch @@ -1,7 +1,7 @@ -From 5a3026dde3ee562bdee02c60aebf979439c4691d Mon Sep 17 00:00:00 2001 +From 9477253b8b3f4e282483087f204160dece3e4428 Mon Sep 17 00:00:00 2001 From: Ivan Iskandar Date: Sun, 18 Sep 2016 21:33:18 +0700 -Subject: [PATCH 16/45] SystemUI: Expose QS edit item decoration background +Subject: [PATCH 16/42] SystemUI: Expose QS edit item decoration background color PS2: @@ -16,7 +16,7 @@ Change-Id: I9867ca26e7d9dacad37d2b70180a98fede0fb0e8 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/SystemUI/res/values/projekt_colors.xml b/packages/SystemUI/res/values/projekt_colors.xml -index a0f1df06b6a..42f4a1568df 100644 +index a0f1df0..42f4a15 100644 --- a/packages/SystemUI/res/values/projekt_colors.xml +++ b/packages/SystemUI/res/values/projekt_colors.xml @@ -18,4 +18,6 @@ @@ -27,7 +27,7 @@ index a0f1df06b6a..42f4a1568df 100644 + @*android:color/secondary_device_default_settings diff --git a/packages/SystemUI/src/com/android/systemui/qs/customize/TileAdapter.java b/packages/SystemUI/src/com/android/systemui/qs/customize/TileAdapter.java -index 8d7f6ee7285..c7a1441a6b3 100644 +index 8d7f6ee..c7a1441 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/customize/TileAdapter.java +++ b/packages/SystemUI/src/com/android/systemui/qs/customize/TileAdapter.java @@ -471,11 +471,10 @@ public class TileAdapter extends RecyclerView.Adapter implements TileSta @@ -54,5 +54,5 @@ index 8d7f6ee7285..c7a1441a6b3 100644 mDrawable.setBounds(0, top, width, bottom); mDrawable.draw(c); -- -2.11.1 +2.9.3 diff --git a/patches/frameworks/base/0017-Allow-custom-alpha-for-notification-shade-bg-color.patch b/patches/frameworks/base/0017-Allow-custom-alpha-for-notification-shade-bg-color.patch index 6b512b1..d195140 100644 --- a/patches/frameworks/base/0017-Allow-custom-alpha-for-notification-shade-bg-color.patch +++ b/patches/frameworks/base/0017-Allow-custom-alpha-for-notification-shade-bg-color.patch @@ -1,7 +1,7 @@ -From 7d58a5685b68031f2d79f3864fd19bf768ece4ee Mon Sep 17 00:00:00 2001 +From 8fc38c23be0ec9307c342bc86b341cc6ae6a41a1 Mon Sep 17 00:00:00 2001 From: Simao Gomes Viana Date: Fri, 25 Nov 2016 20:50:29 +0100 -Subject: [PATCH 17/45] Allow custom alpha for notification shade bg color +Subject: [PATCH 17/42] Allow custom alpha for notification shade bg color Change-Id: If621df83d994feae0448a734408ba85ac8329325 --- @@ -9,7 +9,7 @@ Change-Id: If621df83d994feae0448a734408ba85ac8329325 1 file changed, 27 insertions(+), 13 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java b/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java -index a6fe4382475..5cf0e0a1e10 100644 +index a6fe438..5cf0e0a 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java @@ -430,19 +430,33 @@ public class NotificationStackScrollLayout extends ViewGroup @@ -60,5 +60,5 @@ index a6fe4382475..5cf0e0a1e10 100644 invalidate(); } -- -2.11.1 +2.9.3 diff --git a/patches/frameworks/base/0018-Themes-Expose-various-QuickSettings-text-colors.patch b/patches/frameworks/base/0018-Themes-Expose-various-QuickSettings-text-colors.patch index e5f9be0..c320241 100644 --- a/patches/frameworks/base/0018-Themes-Expose-various-QuickSettings-text-colors.patch +++ b/patches/frameworks/base/0018-Themes-Expose-various-QuickSettings-text-colors.patch @@ -1,7 +1,7 @@ -From e8f79d55a9f209da2be2cd2c6eeeb5c040c0105b Mon Sep 17 00:00:00 2001 +From 30bf956d73cf8598d67a2ddd1156f77085a20aa2 Mon Sep 17 00:00:00 2001 From: "Niklas Schnettler (Sh4dowSoul)" Date: Wed, 5 Oct 2016 18:07:43 +0200 -Subject: [PATCH 18/45] Themes: Expose various QuickSettings text colors +Subject: [PATCH 18/42] Themes: Expose various QuickSettings text colors Change-Id: Iaea71ca83afbc3d8cc6faea6afac16cabb46cfff --- @@ -11,7 +11,7 @@ Change-Id: Iaea71ca83afbc3d8cc6faea6afac16cabb46cfff 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/packages/SystemUI/res/layout/qs_customize_panel_content.xml b/packages/SystemUI/res/layout/qs_customize_panel_content.xml -index 04d0e6524ea..9c232502651 100644 +index 04d0e65..9c23250 100644 --- a/packages/SystemUI/res/layout/qs_customize_panel_content.xml +++ b/packages/SystemUI/res/layout/qs_customize_panel_content.xml @@ -23,7 +23,8 @@ @@ -25,7 +25,7 @@ index 04d0e6524ea..9c232502651 100644 #FFFFFF -- -2.11.1 +2.9.3 diff --git a/patches/frameworks/base/0019-Notifications-Expose-a-bool-to-disable-dynamic-color.patch b/patches/frameworks/base/0019-Notifications-Expose-a-bool-to-disable-dynamic-color.patch index e77339f..8d9e0f2 100644 --- a/patches/frameworks/base/0019-Notifications-Expose-a-bool-to-disable-dynamic-color.patch +++ b/patches/frameworks/base/0019-Notifications-Expose-a-bool-to-disable-dynamic-color.patch @@ -1,7 +1,7 @@ -From bb216afed77d1c7349149df59ba5eca0445002b2 Mon Sep 17 00:00:00 2001 +From c73759dcac1c4ef9785958f9520eb67e3eca3b6a Mon Sep 17 00:00:00 2001 From: Nicholas Chum Date: Sat, 27 Aug 2016 10:56:46 -0400 -Subject: [PATCH 19/45] Notifications: Expose a bool to disable dynamic colors +Subject: [PATCH 19/42] Notifications: Expose a bool to disable dynamic colors This commit allows a themer to overlay a boolean value in config.xml to disable dynamic colors applied to the app title and app icon of each @@ -22,7 +22,7 @@ Change-Id: I3c7828118991ec4fc616011caf073c81f75428b4 create mode 100644 core/res/res/values/projekt_symbols.xml diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java -index 9f217d48aa8..55029aad4ae 100644 +index 9f217d4..55029aa 100644 --- a/core/java/android/app/Notification.java +++ b/core/java/android/app/Notification.java @@ -29,6 +29,7 @@ import android.content.pm.ApplicationInfo; @@ -85,7 +85,7 @@ index 9f217d48aa8..55029aad4ae 100644 } CharSequence text = m.mText == null ? "" : m.mText; diff --git a/core/res/res/values/projekt_colors.xml b/core/res/res/values/projekt_colors.xml -index a7316ab979c..d17fbba053d 100644 +index a7316ab..d17fbba 100644 --- a/core/res/res/values/projekt_colors.xml +++ b/core/res/res/values/projekt_colors.xml @@ -21,4 +21,6 @@ @@ -97,7 +97,7 @@ index a7316ab979c..d17fbba053d 100644 diff --git a/core/res/res/values/projekt_config.xml b/core/res/res/values/projekt_config.xml new file mode 100644 -index 00000000000..f6eb90a49eb +index 0000000..f6eb90a --- /dev/null +++ b/core/res/res/values/projekt_config.xml @@ -0,0 +1,25 @@ @@ -128,7 +128,7 @@ index 00000000000..f6eb90a49eb + diff --git a/core/res/res/values/projekt_symbols.xml b/core/res/res/values/projekt_symbols.xml new file mode 100644 -index 00000000000..f597a5f3f7b +index 0000000..f597a5f --- /dev/null +++ b/core/res/res/values/projekt_symbols.xml @@ -0,0 +1,25 @@ @@ -158,5 +158,5 @@ index 00000000000..f597a5f3f7b + + -- -2.11.1 +2.9.3 diff --git a/patches/frameworks/base/0020-Notification-dynamic-colors-bool-compatible-with-OMS.patch b/patches/frameworks/base/0020-Notification-dynamic-colors-bool-compatible-with-OMS.patch index ecc6ace..1aa27d3 100644 --- a/patches/frameworks/base/0020-Notification-dynamic-colors-bool-compatible-with-OMS.patch +++ b/patches/frameworks/base/0020-Notification-dynamic-colors-bool-compatible-with-OMS.patch @@ -1,7 +1,7 @@ -From 258c2c2b1ceaa81888604097249b28a3723834ff Mon Sep 17 00:00:00 2001 +From b7ea2bb030773f7100c91c233d4644f11fc12b1d Mon Sep 17 00:00:00 2001 From: George G Date: Mon, 14 Nov 2016 14:49:47 +0200 -Subject: [PATCH 20/45] Notification dynamic colors bool compatible with OMS7 +Subject: [PATCH 20/42] Notification dynamic colors bool compatible with OMS7 OMS7 introduced this fine piece of code: https://github.com/SubstratumResources/platform_frameworks_base/blob/n-oms7/core/java/android/app/ResourcesManager.java#L897..#L904 @@ -22,7 +22,7 @@ Change-Id: I02efe27de3cc7067552964ffbaf079f9e9b5bc3e 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java -index 55029aad4ae..67c2132b667 100644 +index 55029aa..67c2132 100644 --- a/core/java/android/app/Notification.java +++ b/core/java/android/app/Notification.java @@ -3918,7 +3918,7 @@ public class Notification implements Parcelable @@ -44,5 +44,5 @@ index 55029aad4ae..67c2132b667 100644 } -- -2.11.1 +2.9.3 diff --git a/patches/frameworks/base/0021-Allow-prevention-of-doze-notification-color-inversio.patch b/patches/frameworks/base/0021-Allow-prevention-of-doze-notification-color-inversio.patch index 55cdf54..506483b 100644 --- a/patches/frameworks/base/0021-Allow-prevention-of-doze-notification-color-inversio.patch +++ b/patches/frameworks/base/0021-Allow-prevention-of-doze-notification-color-inversio.patch @@ -1,7 +1,7 @@ -From edd465d7af676b267a995312f615bf76d7cc4661 Mon Sep 17 00:00:00 2001 +From d05f1f1d23dbba179cc81afc64ebb7335f4a9d94 Mon Sep 17 00:00:00 2001 From: Daniel Koman Date: Fri, 17 Apr 2015 11:56:28 -0600 -Subject: [PATCH 21/45] Allow prevention of doze notification color inversion +Subject: [PATCH 21/42] Allow prevention of doze notification color inversion Removed empty newline at the end -- KreAch3R Removed slims files for aosp roms -- Bgill55 @@ -14,7 +14,7 @@ Change-Id: I2d361c34904f3d168894b8b1741456319fd68456 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/core/res/res/values/projekt_config.xml b/core/res/res/values/projekt_config.xml -index f6eb90a49eb..5234959fc9e 100644 +index f6eb90a..5234959 100644 --- a/core/res/res/values/projekt_config.xml +++ b/core/res/res/values/projekt_config.xml @@ -22,4 +22,9 @@ @@ -28,7 +28,7 @@ index f6eb90a49eb..5234959fc9e 100644 + diff --git a/core/res/res/values/projekt_symbols.xml b/core/res/res/values/projekt_symbols.xml -index f597a5f3f7b..16a5728e6c9 100644 +index f597a5f..16a5728 100644 --- a/core/res/res/values/projekt_symbols.xml +++ b/core/res/res/values/projekt_symbols.xml @@ -22,4 +22,7 @@ @@ -40,7 +40,7 @@ index f597a5f3f7b..16a5728e6c9 100644 + diff --git a/packages/SystemUI/src/com/android/systemui/ViewInvertHelper.java b/packages/SystemUI/src/com/android/systemui/ViewInvertHelper.java -index 2c96e31d9f5..65fd1158b95 100644 +index 2c96e31..65fd115 100644 --- a/packages/SystemUI/src/com/android/systemui/ViewInvertHelper.java +++ b/packages/SystemUI/src/com/android/systemui/ViewInvertHelper.java @@ -20,6 +20,7 @@ import android.animation.Animator; @@ -62,5 +62,5 @@ index 2c96e31d9f5..65fd1158b95 100644 for (int i = 0; i < mTargets.size(); i++) { mTargets.get(i).setLayerType(View.LAYER_TYPE_HARDWARE, mDarkPaint); -- -2.11.1 +2.9.3 diff --git a/patches/frameworks/base/0022-OMS7-compatible-Ambient-notification-inversion.patch b/patches/frameworks/base/0022-OMS7-compatible-Ambient-notification-inversion.patch index 16d31f7..0e72f7c 100644 --- a/patches/frameworks/base/0022-OMS7-compatible-Ambient-notification-inversion.patch +++ b/patches/frameworks/base/0022-OMS7-compatible-Ambient-notification-inversion.patch @@ -1,7 +1,7 @@ -From ce6c1809f6799b640de8eeee4cc5181f2d558206 Mon Sep 17 00:00:00 2001 +From da2da4fb97e61e83771ac5c6cd573b21f7ed31d2 Mon Sep 17 00:00:00 2001 From: George G Date: Mon, 14 Nov 2016 14:44:17 +0200 -Subject: [PATCH 22/45] OMS7 compatible 'Ambient notification inversion' +Subject: [PATCH 22/42] OMS7 compatible 'Ambient notification inversion' OMS7 introduced this fine piece of code: https://github.com/SubstratumResources/platform_frameworks_base/blob/n-oms7/core/java/android/app/ResourcesManager.java#L897..#L904 @@ -22,7 +22,7 @@ Change-Id: I80ad5d037004f0dc63d9eb746c3af05e59a8834e 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/ViewInvertHelper.java b/packages/SystemUI/src/com/android/systemui/ViewInvertHelper.java -index 65fd1158b95..605f381e9e2 100644 +index 65fd115..605f381 100644 --- a/packages/SystemUI/src/com/android/systemui/ViewInvertHelper.java +++ b/packages/SystemUI/src/com/android/systemui/ViewInvertHelper.java @@ -20,7 +20,6 @@ import android.animation.Animator; @@ -60,5 +60,5 @@ index 65fd1158b95..605f381e9e2 100644 for (int i = 0; i < mTargets.size(); i++) { mTargets.get(i).setLayerType(View.LAYER_TYPE_HARDWARE, mDarkPaint); -- -2.11.1 +2.9.3 diff --git a/patches/frameworks/base/0023-SystemUI-Use-own-drawables-for-QS-expand-icon.patch b/patches/frameworks/base/0023-SystemUI-Use-own-drawables-for-QS-expand-icon.patch index a02dd60..72756d0 100644 --- a/patches/frameworks/base/0023-SystemUI-Use-own-drawables-for-QS-expand-icon.patch +++ b/patches/frameworks/base/0023-SystemUI-Use-own-drawables-for-QS-expand-icon.patch @@ -1,7 +1,7 @@ -From 5beb75233e577eb6cd6c4bbeb888bc866d89ac93 Mon Sep 17 00:00:00 2001 +From fcabf2291266fe9f9ac8db4d54eba607665874c0 Mon Sep 17 00:00:00 2001 From: Ivan Iskandar Date: Mon, 5 Dec 2016 19:00:04 +0700 -Subject: [PATCH 23/45] SystemUI: Use own drawables for QS expand icon +Subject: [PATCH 23/42] SystemUI: Use own drawables for QS expand icon This was using the volume panel drawables used also on volume panel. So with this commit themers can give different icon for either QS @@ -38,7 +38,7 @@ Change-Id: Ice8d8a520b9b22ba773cceb885e11c8a4bbf6d5f diff --git a/packages/SystemUI/res/anim/ic_qs_collapse_chevron_02_animation.xml b/packages/SystemUI/res/anim/ic_qs_collapse_chevron_02_animation.xml new file mode 100644 -index 00000000000..443f2a651e5 +index 0000000..443f2a6 --- /dev/null +++ b/packages/SystemUI/res/anim/ic_qs_collapse_chevron_02_animation.xml @@ -0,0 +1,25 @@ @@ -70,7 +70,7 @@ index 00000000000..443f2a651e5 \ No newline at end of file diff --git a/packages/SystemUI/res/anim/ic_qs_collapse_rectangle_1_animation.xml b/packages/SystemUI/res/anim/ic_qs_collapse_rectangle_1_animation.xml new file mode 100644 -index 00000000000..b73cdcad154 +index 0000000..b73cdca --- /dev/null +++ b/packages/SystemUI/res/anim/ic_qs_collapse_rectangle_1_animation.xml @@ -0,0 +1,26 @@ @@ -102,7 +102,7 @@ index 00000000000..b73cdcad154 + diff --git a/packages/SystemUI/res/anim/ic_qs_collapse_rectangle_2_animation.xml b/packages/SystemUI/res/anim/ic_qs_collapse_rectangle_2_animation.xml new file mode 100644 -index 00000000000..91c83fc5eff +index 0000000..91c83fc --- /dev/null +++ b/packages/SystemUI/res/anim/ic_qs_collapse_rectangle_2_animation.xml @@ -0,0 +1,26 @@ @@ -134,7 +134,7 @@ index 00000000000..91c83fc5eff + diff --git a/packages/SystemUI/res/anim/ic_qs_expand_chevron_01_animation.xml b/packages/SystemUI/res/anim/ic_qs_expand_chevron_01_animation.xml new file mode 100644 -index 00000000000..e43e6453d82 +index 0000000..e43e645 --- /dev/null +++ b/packages/SystemUI/res/anim/ic_qs_expand_chevron_01_animation.xml @@ -0,0 +1,25 @@ @@ -166,7 +166,7 @@ index 00000000000..e43e6453d82 \ No newline at end of file diff --git a/packages/SystemUI/res/anim/ic_qs_expand_rectangle_3_animation.xml b/packages/SystemUI/res/anim/ic_qs_expand_rectangle_3_animation.xml new file mode 100644 -index 00000000000..493bdae7900 +index 0000000..493bdae --- /dev/null +++ b/packages/SystemUI/res/anim/ic_qs_expand_rectangle_3_animation.xml @@ -0,0 +1,26 @@ @@ -198,7 +198,7 @@ index 00000000000..493bdae7900 + diff --git a/packages/SystemUI/res/anim/ic_qs_expand_rectangle_4_animation.xml b/packages/SystemUI/res/anim/ic_qs_expand_rectangle_4_animation.xml new file mode 100644 -index 00000000000..58e485c9c74 +index 0000000..58e485c --- /dev/null +++ b/packages/SystemUI/res/anim/ic_qs_expand_rectangle_4_animation.xml @@ -0,0 +1,26 @@ @@ -230,7 +230,7 @@ index 00000000000..58e485c9c74 + diff --git a/packages/SystemUI/res/drawable/ic_qs_collapse.xml b/packages/SystemUI/res/drawable/ic_qs_collapse.xml new file mode 100644 -index 00000000000..bba6b7f1341 +index 0000000..bba6b7f --- /dev/null +++ b/packages/SystemUI/res/drawable/ic_qs_collapse.xml @@ -0,0 +1,62 @@ @@ -298,7 +298,7 @@ index 00000000000..bba6b7f1341 + diff --git a/packages/SystemUI/res/drawable/ic_qs_collapse_animation.xml b/packages/SystemUI/res/drawable/ic_qs_collapse_animation.xml new file mode 100644 -index 00000000000..8138b2e9cff +index 0000000..8138b2e --- /dev/null +++ b/packages/SystemUI/res/drawable/ic_qs_collapse_animation.xml @@ -0,0 +1,29 @@ @@ -333,7 +333,7 @@ index 00000000000..8138b2e9cff + diff --git a/packages/SystemUI/res/drawable/ic_qs_expand.xml b/packages/SystemUI/res/drawable/ic_qs_expand.xml new file mode 100644 -index 00000000000..bb220641e81 +index 0000000..bb22064 --- /dev/null +++ b/packages/SystemUI/res/drawable/ic_qs_expand.xml @@ -0,0 +1,62 @@ @@ -401,7 +401,7 @@ index 00000000000..bb220641e81 + diff --git a/packages/SystemUI/res/drawable/ic_qs_expand_animation.xml b/packages/SystemUI/res/drawable/ic_qs_expand_animation.xml new file mode 100644 -index 00000000000..b561ee06ad8 +index 0000000..b561ee0 --- /dev/null +++ b/packages/SystemUI/res/drawable/ic_qs_expand_animation.xml @@ -0,0 +1,29 @@ @@ -436,7 +436,7 @@ index 00000000000..b561ee06ad8 + diff --git a/packages/SystemUI/res/interpolator/ic_qs_collapse_animation_interpolator_0.xml b/packages/SystemUI/res/interpolator/ic_qs_collapse_animation_interpolator_0.xml new file mode 100644 -index 00000000000..c3930e42cda +index 0000000..c3930e4 --- /dev/null +++ b/packages/SystemUI/res/interpolator/ic_qs_collapse_animation_interpolator_0.xml @@ -0,0 +1,17 @@ @@ -459,7 +459,7 @@ index 00000000000..c3930e42cda + android:pathData="M 0.0,0.0 c 0.0001,0.0 0.0,1.0 1.0,1.0" /> diff --git a/packages/SystemUI/res/interpolator/ic_qs_expand_animation_interpolator_0.xml b/packages/SystemUI/res/interpolator/ic_qs_expand_animation_interpolator_0.xml new file mode 100644 -index 00000000000..c3930e42cda +index 0000000..c3930e4 --- /dev/null +++ b/packages/SystemUI/res/interpolator/ic_qs_expand_animation_interpolator_0.xml @@ -0,0 +1,17 @@ @@ -481,7 +481,7 @@ index 00000000000..c3930e42cda + diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ExpandableIndicator.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ExpandableIndicator.java -index a295cfacbbc..0f04c28b98c 100644 +index a295cfa..0f04c28 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ExpandableIndicator.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ExpandableIndicator.java @@ -57,11 +57,11 @@ public class ExpandableIndicator extends ImageView { @@ -501,5 +501,5 @@ index a295cfacbbc..0f04c28b98c 100644 } -- -2.11.1 +2.9.3 diff --git a/patches/frameworks/base/0024-N-Extras-Add-dynamic-theme-BootAnimation-support.patch b/patches/frameworks/base/0024-N-Extras-Add-dynamic-theme-BootAnimation-support.patch index b4ee011..5d93cd8 100644 --- a/patches/frameworks/base/0024-N-Extras-Add-dynamic-theme-BootAnimation-support.patch +++ b/patches/frameworks/base/0024-N-Extras-Add-dynamic-theme-BootAnimation-support.patch @@ -1,19 +1,18 @@ -From c8d48b032e7a0541fc2909c6f448ff3a0f01c59f Mon Sep 17 00:00:00 2001 +From 8c8faa693f271deb6db33ccf44fc9f094311bc90 Mon Sep 17 00:00:00 2001 From: 0xD34D -Date: Mon, 9 Jan 2017 07:19:41 +0530 -Subject: [PATCH 24/45] N-Extras: Add dynamic theme BootAnimation support +Date: Mon, 20 Jun 2016 22:59:48 +0300 +Subject: [PATCH 24/42] N-Extras: Add dynamic theme BootAnimation support Extracted from "Themes: Port to CM13 [1/3]" http://review.cyanogenmod.org/#/c/113273/14 Change-Id: I394897c10f02695f0416e87e9bf960e840bcb3b7 --- - cmds/bootanimation/BootAnimation.cpp | 11 ++++++++--- - cmds/bootanimation/BootAnimation.h | 3 ++- - 2 files changed, 10 insertions(+), 4 deletions(-) + cmds/bootanimation/BootAnimation.cpp | 4 ++++ + 1 file changed, 4 insertions(+) diff --git a/cmds/bootanimation/BootAnimation.cpp b/cmds/bootanimation/BootAnimation.cpp -index d4a9326fc0d..dfa70e3e44c 100644 +index d4a9326..57e1992 100644 --- a/cmds/bootanimation/BootAnimation.cpp +++ b/cmds/bootanimation/BootAnimation.cpp @@ -68,6 +68,7 @@ namespace android { @@ -24,49 +23,16 @@ index d4a9326fc0d..dfa70e3e44c 100644 static const char SYSTEM_DATA_DIR_PATH[] = "/data/system"; static const char SYSTEM_TIME_DIR_NAME[] = "time"; static const char SYSTEM_TIME_DIR_PATH[] = "/data/system/time"; -@@ -250,13 +251,14 @@ status_t BootAnimation::initTexture(const Animation::Frame& frame) - - - // Get bootup Animation File --// Parameter: ImageID: IMG_OEM IMG_SYS IMG_ENC -+// Parameter: ImageID: IMG_OEM IMG_SYS IMG_ENC IMG_THM - // Return Value : File path - const char *BootAnimation::getAnimationFileName(ImageID image) - { -- const char *fileName[3] = { OEM_BOOTANIMATION_FILE, -+ const char *fileName[4] = { OEM_BOOTANIMATION_FILE, - SYSTEM_BOOTANIMATION_FILE, -- SYSTEM_ENCRYPTED_BOOTANIMATION_FILE }; -+ SYSTEM_ENCRYPTED_BOOTANIMATION_FILE, -+ THEME_BOOTANIMATION_FILE }; - - // Load animations of Carrier through regionalization environment - if (Environment::isSupported()) { -@@ -341,6 +343,9 @@ status_t BootAnimation::readyToRun() { +@@ -341,6 +342,9 @@ status_t BootAnimation::readyToRun() { if (encryptedAnimation && (access(getAnimationFileName(IMG_ENC), R_OK) == 0)) { mZipFileName = getAnimationFileName(IMG_ENC); } -+ else if (access(getAnimationFileName(IMG_THM), R_OK) == 0) { -+ mZipFileName = getAnimationFileName(IMG_THM); ++ else if (access(THEME_BOOTANIMATION_FILE, R_OK) == 0) { ++ mZipFileName = THEME_BOOTANIMATION_FILE; + } else if (access(getAnimationFileName(IMG_OEM), R_OK) == 0) { mZipFileName = getAnimationFileName(IMG_OEM); } -diff --git a/cmds/bootanimation/BootAnimation.h b/cmds/bootanimation/BootAnimation.h -index c0ae6b6edb1..e779246da46 100644 ---- a/cmds/bootanimation/BootAnimation.h -+++ b/cmds/bootanimation/BootAnimation.h -@@ -114,8 +114,9 @@ private: - *IMG_OEM: bootanimation file from oem/media - *IMG_SYS: bootanimation file from system/media - *IMG_ENC: encrypted bootanimation file from system/media -+ *IMG_THM: bootanimation file from data/system/theme - */ -- enum ImageID { IMG_OEM = 0, IMG_SYS = 1, IMG_ENC = 2 }; -+ enum ImageID { IMG_OEM = 0, IMG_SYS = 1, IMG_ENC = 2, IMG_THM = 3 }; - const char *getAnimationFileName(ImageID image); - status_t initTexture(Texture* texture, AssetManager& asset, const char* name); - status_t initTexture(const Animation::Frame& frame); -- -2.11.1 +2.9.3 diff --git a/patches/frameworks/base/0025-N-Extras-Add-dynamic-theme-fonts-support.patch b/patches/frameworks/base/0025-N-Extras-Add-dynamic-theme-fonts-support.patch index ab6df52..dce2889 100644 --- a/patches/frameworks/base/0025-N-Extras-Add-dynamic-theme-fonts-support.patch +++ b/patches/frameworks/base/0025-N-Extras-Add-dynamic-theme-fonts-support.patch @@ -1,7 +1,7 @@ -From 5dae5610d22e8fc2cc85c454f07d01b6902e6927 Mon Sep 17 00:00:00 2001 +From 85f513176bc75a55eb2c6681994e5ce0315e5745 Mon Sep 17 00:00:00 2001 From: 0xD34D Date: Wed, 22 Jun 2016 23:54:23 +0300 -Subject: [PATCH 25/45] N-Extras: Add dynamic theme fonts support +Subject: [PATCH 25/42] N-Extras: Add dynamic theme fonts support Due to the nature of the removal of assetSeq in OMS7+, we now use the more controllable font scale updating code to update the fonts on @@ -53,7 +53,7 @@ Change-Id: I1f61bd269b42ab6145482a51d25fe5b1b5308f94 8 files changed, 240 insertions(+), 27 deletions(-) diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java -index 55fc25de68b..44a900b3a1f 100644 +index 55fc25d..44a900b 100644 --- a/core/java/android/app/ActivityThread.java +++ b/core/java/android/app/ActivityThread.java @@ -48,6 +48,7 @@ import android.database.sqlite.SQLiteDebug; @@ -79,7 +79,7 @@ index 55fc25de68b..44a900b3a1f 100644 } } diff --git a/core/java/android/content/pm/ActivityInfo.java b/core/java/android/content/pm/ActivityInfo.java -index 5a09c0028cd..42febcfe59c 100644 +index 5a09c00..42febcf 100644 --- a/core/java/android/content/pm/ActivityInfo.java +++ b/core/java/android/content/pm/ActivityInfo.java @@ -624,6 +624,11 @@ public class ActivityInfo extends ComponentInfo @@ -95,7 +95,7 @@ index 5a09c0028cd..42febcfe59c 100644 * can itself handle changes to the font scaling factor. Set from the * {@link android.R.attr#configChanges} attribute. This is diff --git a/core/java/android/content/res/Configuration.java b/core/java/android/content/res/Configuration.java -index b2d518c56ca..2f7c3ec18dc 100644 +index b2d518c..2f7c3ec 100644 --- a/core/java/android/content/res/Configuration.java +++ b/core/java/android/content/res/Configuration.java @@ -955,6 +955,7 @@ public final class Configuration implements Parcelable, Comparable Date: Sun, 17 Jul 2016 17:56:40 -0400 -Subject: [PATCH 26/45] N-Extras: AudioService: Allow system effect sounds to +Subject: [PATCH 26/42] N-Extras: AudioService: Allow system effect sounds to be themed This commit checks whether there is a preexisting file in the themed @@ -17,7 +17,7 @@ Change-Id: I7666c2bd259443ccec442bf6059786bea3dc069e 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java -index f5db48806de..c6144d0b0b9 100644 +index f5db488..c6144d0 100644 --- a/services/core/java/com/android/server/audio/AudioService.java +++ b/services/core/java/com/android/server/audio/AudioService.java @@ -123,6 +123,7 @@ import com.android.server.pm.UserManagerService; @@ -75,5 +75,5 @@ index f5db48806de..c6144d0b0b9 100644 mediaPlayer.setAudioStreamType(AudioSystem.STREAM_SYSTEM); mediaPlayer.prepare(); -- -2.11.1 +2.9.3 diff --git a/patches/frameworks/base/0027-OMS7-N-ApplicationsState-add-filter-for-Substratum-o.patch b/patches/frameworks/base/0027-OMS7-N-ApplicationsState-add-filter-for-Substratum-o.patch index 5a71108..f6d20b5 100644 --- a/patches/frameworks/base/0027-OMS7-N-ApplicationsState-add-filter-for-Substratum-o.patch +++ b/patches/frameworks/base/0027-OMS7-N-ApplicationsState-add-filter-for-Substratum-o.patch @@ -1,7 +1,7 @@ -From b78103f1cc4026e0a3abd3c797353e27a0338c3d Mon Sep 17 00:00:00 2001 +From 805acc56474ad545d43d1edc43521646ce1d5629 Mon Sep 17 00:00:00 2001 From: George G Date: Mon, 4 Jul 2016 06:25:15 +0300 -Subject: [PATCH 27/45] OMS7-N: ApplicationsState: add filter for Substratum +Subject: [PATCH 27/42] OMS7-N: ApplicationsState: add filter for Substratum overlays [1/2] This commit allows the framework to handle the filtering of the @@ -13,7 +13,7 @@ Change-Id: I7646115e8f73494d726728fac58cc47aafd69d5d 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java b/packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java -index f0ec1078650..6fecd4044ca 100644 +index f0ec107..6fecd40 100644 --- a/packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java +++ b/packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java @@ -137,9 +137,11 @@ public class ApplicationsState { @@ -49,5 +49,5 @@ index f0ec1078650..6fecd4044ca 100644 private int mCurrentUser; -- -2.11.1 +2.9.3 diff --git a/patches/frameworks/base/0028-OMS7-N-ApplicationsState-add-filter-for-Substratum-i.patch b/patches/frameworks/base/0028-OMS7-N-ApplicationsState-add-filter-for-Substratum-i.patch index 5e88fab..304755c 100644 --- a/patches/frameworks/base/0028-OMS7-N-ApplicationsState-add-filter-for-Substratum-i.patch +++ b/patches/frameworks/base/0028-OMS7-N-ApplicationsState-add-filter-for-Substratum-i.patch @@ -1,7 +1,7 @@ -From 3475d1a7cbb8dbfefd702d20c1117e38b794ad74 Mon Sep 17 00:00:00 2001 +From 71f429c997955ac1b699b766a5f6b3092c943368 Mon Sep 17 00:00:00 2001 From: Kuba Schenk Date: Thu, 1 Dec 2016 21:48:26 +0100 -Subject: [PATCH 28/45] OMS7-N: ApplicationsState: add filter for Substratum +Subject: [PATCH 28/42] OMS7-N: ApplicationsState: add filter for Substratum icon overlays [1/2] This commit allows the framework to handle the filtering of the icon overlays found for OMS. @@ -15,7 +15,7 @@ Change-Id: I594c993977733e67f566ac65df50ad2e1bbdbdd3 1 file changed, 11 insertions(+) diff --git a/packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java b/packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java -index 6fecd4044ca..d3a6e217735 100644 +index 6fecd40..d3a6e21 100644 --- a/packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java +++ b/packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java @@ -1325,6 +1325,17 @@ public class ApplicationsState { @@ -37,5 +37,5 @@ index 6fecd4044ca..d3a6e217735 100644 private int mCurrentUser; -- -2.11.1 +2.9.3 diff --git a/patches/frameworks/base/0029-Themes-Expose-QS-battery.patch b/patches/frameworks/base/0029-Themes-Expose-QS-battery.patch index bc31d9e..2e89d68 100644 --- a/patches/frameworks/base/0029-Themes-Expose-QS-battery.patch +++ b/patches/frameworks/base/0029-Themes-Expose-QS-battery.patch @@ -1,7 +1,7 @@ -From da6d7a0af5b508354da61897b8cf96ca7b3b8cb4 Mon Sep 17 00:00:00 2001 +From 4ae81255155c004674774096bbb28006e8cedcb0 Mon Sep 17 00:00:00 2001 From: Abdulwahab Isam Date: Fri, 7 Oct 2016 08:30:11 +0300 -Subject: [PATCH 29/45] Themes: Expose QS battery +Subject: [PATCH 29/42] Themes: Expose QS battery This is needed for white themes like Belo. Should function the same with dark themes as well. @@ -12,7 +12,7 @@ Change-Id: I65e3f777a2a2605a06260705f92f8617407d9005 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/packages/SystemUI/res/layout/battery_detail.xml b/packages/SystemUI/res/layout/battery_detail.xml -index 8abfcf6057a..af3acdc5c53 100644 +index 8abfcf6..af3acdc 100644 --- a/packages/SystemUI/res/layout/battery_detail.xml +++ b/packages/SystemUI/res/layout/battery_detail.xml @@ -27,7 +27,7 @@ @@ -36,7 +36,7 @@ index 8abfcf6057a..af3acdc5c53 100644 @*android:color/accent_device_default_light -- -2.11.1 +2.9.3 diff --git a/patches/frameworks/base/0030-OMS-Introduce-MODIFY_OVERLAYS-permission-for-user-ap.patch b/patches/frameworks/base/0030-OMS-Introduce-MODIFY_OVERLAYS-permission-for-user-ap.patch index 7d9db5f..5fac5fe 100644 --- a/patches/frameworks/base/0030-OMS-Introduce-MODIFY_OVERLAYS-permission-for-user-ap.patch +++ b/patches/frameworks/base/0030-OMS-Introduce-MODIFY_OVERLAYS-permission-for-user-ap.patch @@ -1,7 +1,7 @@ -From 30aa3f06924819530a7074d17f7be91c419c24da Mon Sep 17 00:00:00 2001 +From 8498f45dd03853cc1c83905de81e7a80d282aa10 Mon Sep 17 00:00:00 2001 From: bigrushdog Date: Mon, 19 Dec 2016 04:33:31 -0800 -Subject: [PATCH 30/45] OMS: Introduce MODIFY_OVERLAYS permission for user apps +Subject: [PATCH 30/42] OMS: Introduce MODIFY_OVERLAYS permission for user apps This permission will grant the app read and write permissions to access OverlayManagerService. If caller does not posess @@ -16,7 +16,7 @@ Change-Id: Ib6b10b516577f338aee31e759bfd16278f902c20 3 files changed, 29 insertions(+), 8 deletions(-) diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml -index 6a5bd3946db..3ceb17ba568 100644 +index 6a5bd39..3ceb17b 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -3162,6 +3162,12 @@ @@ -33,7 +33,7 @@ index 6a5bd3946db..3ceb17ba568 100644 android:persistent="true" android:hasCode="false" diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml -index 1823629341c..d0923ccf6dc 100755 +index 8f5f8cf..8313d5d 100755 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -1411,6 +1411,11 @@ @@ -49,7 +49,7 @@ index 1823629341c..d0923ccf6dc 100755 diff --git a/services/core/java/com/android/server/om/OverlayManagerService.java b/services/core/java/com/android/server/om/OverlayManagerService.java -index deb9046a2d4..e205ce1d030 100644 +index deb9046..e205ce1 100644 --- a/services/core/java/com/android/server/om/OverlayManagerService.java +++ b/services/core/java/com/android/server/om/OverlayManagerService.java @@ -36,6 +36,7 @@ import android.content.om.IOverlayManager; @@ -116,5 +116,5 @@ index deb9046a2d4..e205ce1d030 100644 } -- -2.11.1 +2.9.3 diff --git a/patches/frameworks/base/0031-SystemUI-Expose-switch-bar-title.patch b/patches/frameworks/base/0031-SystemUI-Expose-switch-bar-title.patch index cd3006c..6461a60 100644 --- a/patches/frameworks/base/0031-SystemUI-Expose-switch-bar-title.patch +++ b/patches/frameworks/base/0031-SystemUI-Expose-switch-bar-title.patch @@ -1,7 +1,7 @@ -From ab15da5ba451f9812fc074479bd1d045c9c8afcc Mon Sep 17 00:00:00 2001 +From 390ed2ae95bba5ce8097c8561ddc846a45498563 Mon Sep 17 00:00:00 2001 From: daveyannihilation Date: Sun, 1 Jan 2017 01:47:53 -0700 -Subject: [PATCH 31/45] SystemUI: Expose switch bar title +Subject: [PATCH 31/42] SystemUI: Expose switch bar title This is needed for the power notifications switchbar in SystemUI Tuner, amongst other things. @@ -13,7 +13,7 @@ Change-Id: I86f04840c2be46519509556b8d0061cefe26f631 create mode 100644 packages/SystemUI/res/values/projekt_styles.xml diff --git a/packages/SystemUI/res/layout/switch_bar.xml b/packages/SystemUI/res/layout/switch_bar.xml -index 41cdb78392a..344c5aa0531 100644 +index 41cdb78..344c5aa 100644 --- a/packages/SystemUI/res/layout/switch_bar.xml +++ b/packages/SystemUI/res/layout/switch_bar.xml @@ -33,8 +33,7 @@ @@ -28,7 +28,7 @@ index 41cdb78392a..344c5aa0531 100644 diff --git a/packages/SystemUI/res/values/projekt_styles.xml b/packages/SystemUI/res/values/projekt_styles.xml new file mode 100644 -index 00000000000..f49834bc202 +index 0000000..f49834b --- /dev/null +++ b/packages/SystemUI/res/values/projekt_styles.xml @@ -0,0 +1,24 @@ @@ -57,5 +57,5 @@ index 00000000000..f49834bc202 + + -- -2.11.1 +2.9.3 diff --git a/patches/frameworks/base/0032-Themes-Expose-manifest-styles-for-themes.patch b/patches/frameworks/base/0032-Themes-Expose-manifest-styles-for-themes.patch deleted file mode 100644 index 576d197..0000000 --- a/patches/frameworks/base/0032-Themes-Expose-manifest-styles-for-themes.patch +++ /dev/null @@ -1,151 +0,0 @@ -From b1cbf5224969aaf156e24c5e56ef1cb5d7a541dc Mon Sep 17 00:00:00 2001 -From: Bryan Owens -Date: Fri, 6 Jan 2017 21:12:15 +0800 -Subject: [PATCH 32/45] Themes: Expose manifest styles for themes - -Change-Id: Ie3a4fdead4f4fa1c121018b38de1c86a05bbcff2 ---- - core/res/AndroidManifest.xml | 20 ++++++++--------- - core/res/res/values/projekt_styles.xml | 41 ++++++++++++++++++++++++++++++++++ - 2 files changed, 51 insertions(+), 10 deletions(-) - create mode 100644 core/res/res/values/projekt_styles.xml - -diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml -index 3ceb17ba568..36df6eac13e 100644 ---- a/core/res/AndroidManifest.xml -+++ b/core/res/AndroidManifest.xml -@@ -3214,7 +3214,7 @@ - android:label="@string/managed_profile_label"> - - - -@@ -3255,14 +3255,14 @@ - - - - - -@@ -3270,19 +3270,19 @@ - - - - - - - - -@@ -3302,7 +3302,7 @@ - - - - -@@ -3323,7 +3323,7 @@ - -+ android:theme="@style/ConfirmUserCreationActivityTheme"> - - - -@@ -3331,7 +3331,7 @@ - - - - -diff --git a/core/res/res/values/projekt_styles.xml b/core/res/res/values/projekt_styles.xml -new file mode 100644 -index 00000000000..e5fe635818a ---- /dev/null -+++ b/core/res/res/values/projekt_styles.xml -@@ -0,0 +1,41 @@ -+ -+ -+ -+ -+ -+ -+ -+