ROOT="${PWD}"
REPOSITORIES=(
- 'packages/apps/ContactsCommon'
+ 'build'
+ 'frameworks/base'
+ 'frameworks/native'
'packages/apps/Contacts'
- 'packages/apps/Settings'
+ 'packages/apps/ContactsCommon'
+ 'packages/apps/Dialer'
'packages/apps/ExactCalculator'
'packages/apps/PhoneCommon'
- 'build'
+ 'packages/apps/Settings'
'system/core'
'system/sepolicy'
- 'frameworks/native'
- 'frameworks/base'
'vendor/cm'
)
-From 8ec642197731c5f396ffdac5f523ba7a1ea876f5 Mon Sep 17 00:00:00 2001
+From d07486f26f3fe0b9a22fbac5531b9852d9988ab3 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/40] OMS7-N: Support tagging resources as OK to overlay
+Subject: [PATCH 01/41] OMS7-N: Support tagging resources as OK to overlay
[1/11]
This will allow applications to have a resource xml defining what
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:
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 {
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
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)
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 {
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,
: 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:
Vector<sp<ConfigList> > mOrderedConfigs;
SortedVector<String16> mCanAddEntries;
--
-2.11.1
+2.9.3
-From 9f48ca24be13dcffc0499cbfc4cf081fffa9ae21 Mon Sep 17 00:00:00 2001
+From f3466dfae58c90cf66ce7ba80f5bde10caa9e559 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/40] OMS7-N: Introduce the OverlayManagerService [2/11]
+Subject: [PATCH 02/41] 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
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 += \
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 {
* 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 {
* {@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 @@
+}
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 @@
+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 @@
+ }
+}
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 {
+ 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 @@
<protected-broadcast android:name="android.os.action.POWER_SAVE_MODE_CHANGED" />
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 @@
+}
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 @@
+}
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 @@
+}
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 @@
+}
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 @@
+ }
+}
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 5a06bb3..cfc5a0e 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());
@Override
--
-2.11.1
+2.9.3
-From c3f749bbe6d5f55ea88683f90e44ae91fd3bde3e Mon Sep 17 00:00:00 2001
+From f0f40f676d1c318d42b8d408cfe203705b1e43ab 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/40] OMS7-N: Integrate OverlayManagerService into framework
+Subject: [PATCH 03/41] OMS7-N: Integrate OverlayManagerService into framework
[3/11]
Hand over ownership of overlays to OverlayManagerService.
21 files changed, 335 insertions(+), 480 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 @@
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\
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,
#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 @@
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 {
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 @@
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 {
+ 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 {
+ 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;
}
}
diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java
-index f2e3333b67d..8d42d2c590c 100644
+index f2e3333..8d42d2c 100644
--- a/core/java/android/content/pm/PackageParser.java
+++ b/core/java/android/content/pm/PackageParser.java
@@ -668,10 +668,9 @@ public class PackageParser {
ai.protect = state.protectedComponents.size() > 0;
}
diff --git a/core/java/android/content/pm/PackageUserState.java b/core/java/android/content/pm/PackageUserState.java
-index e64e4c4cc5e..4b276fb786f 100644
+index e64e4c4..4b276fb 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;
? new ArraySet<String>(o.protectedComponents) : null;
visibleComponents = o.visibleComponents != null
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,
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..c499103 100644
--- a/include/androidfw/AssetManager.h
+++ b/include/androidfw/AssetManager.h
@@ -238,12 +238,10 @@ public:
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(
* 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 @@
* 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
* 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 {
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 cfc5a0e..8954923 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 {
}
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..18c79cd 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
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..2b36e0e 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 {
} else if (tagName.equals("preferred-activities")) {
readPreferredActivitiesLPw(parser, userId);
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;
// service, and permissions service, therefore we start it after them.
startSensorService();
--
-2.11.1
+2.9.3
-From eda195a2af67f25eb16d3c664633493442222219 Mon Sep 17 00:00:00 2001
+From c1b44cfc571b13251f309ae88fa508d14e88757e 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/40] OMS7-N: Set EXTRA_REPLACING correctly in
+Subject: [PATCH 04/41] OMS7-N: Set EXTRA_REPLACING correctly in
ACTION_PACKAGE_ADDED [4/11]
When broadcasting ACTION_PACKAGE_ADDED the recipients of the Intent are
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 8954923..3abcdbb 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 {
}
sendPackageBroadcast(Intent.ACTION_PACKAGE_ADDED, packageName,
--
-2.11.1
+2.9.3
-From 290b23e104c7b734a14681014a49e1c9e3ad7778 Mon Sep 17 00:00:00 2001
+From 102f77b58d5e8fdf1ffa3cde1d9e7def7e258ddb 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/40] OMS7-N: idmap: suppress print for padded resources
+Subject: [PATCH 05/41] OMS7-N: idmap: suppress print for padded resources
[5/11]
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 {
}
--
-2.11.1
+2.9.3
-From 76209755d9e6c75216f3eaa6de10cabfa049e1c6 Mon Sep 17 00:00:00 2001
+From b1d23772931f66453ecf99e83e14eea004994d6b 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/40] OMS7-N: Fix memory leak during idmap creation [6/11]
+Subject: [PATCH 06/41] OMS7-N: Fix memory leak during idmap creation [6/11]
Plug a memory leak in AssetManager::createIdmap.
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
bool AssetManager::addDefaultAssets()
--
-2.11.1
+2.9.3
-From b7d55a41e4678d890001446a92dfa963a2f47df7 Mon Sep 17 00:00:00 2001
+From 0ae524b1eb5203b583a1a8eb85d2c760ebeac7f3 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/40] OMS7-N: installd: add command 'rmidmap' [7/11]
+Subject: [PATCH 07/41] 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
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 {
assertValidInstructionSet(instructionSet);
mInstaller.execute("rmdex", codePath, instructionSet);
--
-2.11.1
+2.9.3
-From cde3cafcd896c58711efd66a5d91c05119ff8288 Mon Sep 17 00:00:00 2001
+From 4932eb37c98c0bd99cbdb4d361786dccae8766cb 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/40] OMS7-N: Disable Zygote preloaded drawables [8/11]
+Subject: [PATCH 08/41] 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
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 {
mResources.finishPreloading();
} catch (RuntimeException e) {
--
-2.11.1
+2.9.3
-From 679100e3ccf934ccf50994f8c833a43934056790 Mon Sep 17 00:00:00 2001
+From be65b305cc3a5774bc4f2ab6d9dd9b784b256ebe 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/40] OMS7-N: Persistence on boot through
+Subject: [PATCH 09/41] OMS7-N: Persistence on boot through
OverlayManagerServiceImpl [9/11]
Overlays should not be enforced by the traditional OverlayManagerService
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 {
private void removeIdmapIfPossible(@NonNull final OverlayInfo oi) {
--
-2.11.1
+2.9.3
-From 595840d45464a097bb2d83844397f7f129c30814 Mon Sep 17 00:00:00 2001
+From a7ff75d09244fa9a8a421cfc999379da621c408e 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/40] OMS7-N: Do not enforce code policy limiting overlay
+Subject: [PATCH 10/41] OMS7-N: Do not enforce code policy limiting overlay
installation [10/11]
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 3abcdbb..faaff1f 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 {
mCustomResolverComponentName.getPackageName().equals(pkg.packageName)) {
setUpCustomResolverActivity(pkg);
--
-2.11.1
+2.9.3
-From 8c94efa1ae13cac3f44dcf6d02cf8a0efc965ddd Mon Sep 17 00:00:00 2001
+From 305c00ccb8fe676877485f1bd7c0cc41d34b1dd7 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/40] OMS7-N: Implement multi-target enable/disable and
+Subject: [PATCH 11/41] 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
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 {
+ 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 {
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 {
}
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 {
}
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;
private int runSetPriority() throws RemoteException {
--
-2.11.1
+2.9.3
-From c086844eb59eabeaf5197d8216d210703b506290 Mon Sep 17 00:00:00 2001
+From 6b36b4663c1da24ecec0196180dddc283f3a721b 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/40] Themes: Expose resolver hardcoded colors
+Subject: [PATCH 12/41] Themes: Expose resolver hardcoded colors
commit dbbd5e70cc65002df41561474b03362022dd6716
Author: Dave Kover <dkover@cyngn.com>
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 @@
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 @@
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 @@
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 @@
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 @@
+ <color name="resolver_list_bg">@color/white</color>
+</resources>
--
-2.11.1
+2.9.3
-From 8b80415322b8b55009cab0568f7bcc3e2a9bb43e Mon Sep 17 00:00:00 2001
+From aa2c8a922722632841d9142a88586dc236cad408 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/40] Themes: Allow Immersive cling colors to be fully themed
+Subject: [PATCH 13/41] 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
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 @@
\ No newline at end of file
+</RelativeLayout>
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 @@
+ <color name="immersive_cling_button_text_color">@android:color/white</color>
</resources>
--
-2.11.1
+2.9.3
-From 9bd42cd643e8b234c6da0c477476043bc2477835 Mon Sep 17 00:00:00 2001
+From af05b5247a40c91e0de13f762d0af99041c69a4a 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/40] Themes: Allow Permission Icons to be fully themed
+Subject: [PATCH 14/41] 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.
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 @@
<ImageView
android:layout_width="wrap_content"
diff --git a/core/res/res/values/projekt_colors.xml b/core/res/res/values/projekt_colors.xml
-index 7408ae99682..a7316ab979c 100644
+index 7408ae9..a7316ab 100644
--- a/core/res/res/values/projekt_colors.xml
+++ b/core/res/res/values/projekt_colors.xml
@@ -20,4 +20,5 @@
+ <color name="app_permission_icon_tint">@android:color/black</color>
</resources>
--
-2.11.1
+2.9.3
-From cadf382538a6ab1c3a0149b2460c79115ad0748a Mon Sep 17 00:00:00 2001
+From fc55fd2a74e77e263e81b19aaf537bb7fae17d4e 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/40] Themes: Allow Navbar ripple color to be themed
+Subject: [PATCH 15/41] Themes: Allow Navbar ripple color to be themed
PS1:
Layers Commit by @setiawanjimmy
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 @@
+ <color name="navbutton_ripple_color">#FFFFFFFF</color>
+</resources>
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 {
return mRipplePaint;
}
--
-2.11.1
+2.9.3
-From 29fdbe93da356125fd366bfe959e329672631306 Mon Sep 17 00:00:00 2001
+From 8c6a98311b73e38c0a842d5cf7b4bea5cb626981 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/40] SystemUI: Expose QS edit item decoration background
+Subject: [PATCH 16/41] SystemUI: Expose QS edit item decoration background
color
PS2:
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 @@
+ <color name="qs_edit_item_decoration_bg">@*android:color/secondary_device_default_settings</color>
</resources>
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<Holder> implements TileSta
mDrawable.setBounds(0, top, width, bottom);
mDrawable.draw(c);
--
-2.11.1
+2.9.3
-From 45d7526ebb6cec986e2896c8af6c0c45aecf6aa2 Mon Sep 17 00:00:00 2001
+From 38de6486d9b493868e13c5774dac6b218cf8a33f 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/40] Allow custom alpha for notification shade bg color
+Subject: [PATCH 17/41] Allow custom alpha for notification shade bg color
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
invalidate();
}
--
-2.11.1
+2.9.3
-From 3c836ef5495743af6c24b61ebdea5b15f8273f75 Mon Sep 17 00:00:00 2001
+From 47406dcb3bebfaf7821c2af411a5e8b7b2cdcb52 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/40] Themes: Expose various QuickSettings text colors
+Subject: [PATCH 18/41] Themes: Expose various QuickSettings text colors
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 @@
<android.support.v7.widget.RecyclerView
android:id="@android:id/list"
diff --git a/packages/SystemUI/res/layout/status_bar_alarm_group.xml b/packages/SystemUI/res/layout/status_bar_alarm_group.xml
-index 1b47d4b5a19..dca8afb8cb8 100644
+index 1b47d4b..dca8afb 100644
--- a/packages/SystemUI/res/layout/status_bar_alarm_group.xml
+++ b/packages/SystemUI/res/layout/status_bar_alarm_group.xml
@@ -73,7 +73,7 @@
android:gravity="top"
android:background="?android:attr/selectableItemBackgroundBorderless"
diff --git a/packages/SystemUI/res/values/projekt_colors.xml b/packages/SystemUI/res/values/projekt_colors.xml
-index 42f4a1568df..0f891994c9d 100644
+index 42f4a15..0f89199 100644
--- a/packages/SystemUI/res/values/projekt_colors.xml
+++ b/packages/SystemUI/res/values/projekt_colors.xml
@@ -20,4 +20,8 @@
+ <color name="qs_edit_toolbar_text_color">#FFFFFF</color>
</resources>
--
-2.11.1
+2.9.3
-From bf2044e55915493ff96d3eb22be886cfc0884ca9 Mon Sep 17 00:00:00 2001
+From bce27255976a238a6b4a97fd808521cd72b8026d 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/40] Notifications: Expose a bool to disable dynamic colors
+Subject: [PATCH 19/41] 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
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;
}
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 @@
</resources>
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 @@
+</resources>
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 @@
+
+</resources>
--
-2.11.1
+2.9.3
-From 09b2f321170895b4e6f4e88f5a1c7c84a50fcf7a Mon Sep 17 00:00:00 2001
+From 4a191c1636383128017ee5182873af0df7077195 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/40] Notification dynamic colors bool compatible with OMS7
+Subject: [PATCH 20/41] 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
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
}
--
-2.11.1
+2.9.3
-From 72155ae90df8ca1a97cc567aa9525081f50f0365 Mon Sep 17 00:00:00 2001
+From 9133a2832f4681ca8d1fdab3ad57e5a56535ecf6 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/40] Allow prevention of doze notification color inversion
+Subject: [PATCH 21/41] Allow prevention of doze notification color inversion
Removed empty newline at the end -- KreAch3R
Removed slims files for aosp roms -- Bgill55
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 @@
+
</resources>
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 @@
+
</resources>
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;
for (int i = 0; i < mTargets.size(); i++) {
mTargets.get(i).setLayerType(View.LAYER_TYPE_HARDWARE, mDarkPaint);
--
-2.11.1
+2.9.3
-From 14ef7ee72178546fde1cff851828dafd3a0a6d1d Mon Sep 17 00:00:00 2001
+From 6dd0c6b50d696c4602ab7131135c1a5eb550b2c5 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/40] OMS7 compatible 'Ambient notification inversion'
+Subject: [PATCH 22/41] 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
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;
for (int i = 0; i < mTargets.size(); i++) {
mTargets.get(i).setLayerType(View.LAYER_TYPE_HARDWARE, mDarkPaint);
--
-2.11.1
+2.9.3
-From 8a9b71adc6d850ff3b0b96878f69e8e5d37af548 Mon Sep 17 00:00:00 2001
+From 40bf760e7bee4b0d0d649408e1adfc850dc2b73a 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/40] SystemUI: Use own drawables for QS expand icon
+Subject: [PATCH 23/41] 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
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 @@
\ 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 @@
+</set>
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 @@
+</set>
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 @@
\ 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 @@
+</set>
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 @@
+</set>
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 @@
+</vector>
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 @@
+</animated-vector>
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 @@
+</vector>
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 @@
+</animated-vector>
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 @@
+ 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 @@
+<pathInterpolator xmlns:android="http://schemas.android.com/apk/res/android"
+ 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/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 {
}
--
-2.11.1
+2.9.3
-From 8c7162b979753b834a5e440cc2df5f703563b8ac Mon Sep 17 00:00:00 2001
+From b6ae6c8b465c50b8f37da4d6a81eb0eddadf0e6a Mon Sep 17 00:00:00 2001
From: 0xD34D <clark@scheffsblend.com>
Date: Mon, 9 Jan 2017 07:19:41 +0530
-Subject: [PATCH 24/40] N-Extras: Add dynamic theme BootAnimation support
+Subject: [PATCH 24/41] N-Extras: Add dynamic theme BootAnimation support
Extracted from "Themes: Port to CM13 [1/3]"
http://review.cyanogenmod.org/#/c/113273/14
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/cmds/bootanimation/BootAnimation.cpp b/cmds/bootanimation/BootAnimation.cpp
-index d4a9326fc0d..dfa70e3e44c 100644
+index d4a9326..dfa70e3 100644
--- a/cmds/bootanimation/BootAnimation.cpp
+++ b/cmds/bootanimation/BootAnimation.cpp
@@ -68,6 +68,7 @@ namespace android {
mZipFileName = getAnimationFileName(IMG_OEM);
}
diff --git a/cmds/bootanimation/BootAnimation.h b/cmds/bootanimation/BootAnimation.h
-index c0ae6b6edb1..e779246da46 100644
+index c0ae6b6..e779246 100644
--- a/cmds/bootanimation/BootAnimation.h
+++ b/cmds/bootanimation/BootAnimation.h
@@ -114,8 +114,9 @@ private:
status_t initTexture(Texture* texture, AssetManager& asset, const char* name);
status_t initTexture(const Animation::Frame& frame);
--
-2.11.1
+2.9.3
-From f4c048dd43bed5b12d223c4a78cfda977ea9fce8 Mon Sep 17 00:00:00 2001
+From d5323804320c6588d6d83560c1d403d89dbb3bf5 Mon Sep 17 00:00:00 2001
From: 0xD34D <clark@scheffsblend.com>
Date: Wed, 22 Jun 2016 23:54:23 +0300
-Subject: [PATCH 25/40] N-Extras: Add dynamic theme fonts support
+Subject: [PATCH 25/41] 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
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;
}
}
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
* 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<Configuration
/**
diff --git a/core/java/android/os/Process.java b/core/java/android/os/Process.java
-index e1b7fdad25e..6dcd045b07f 100644
+index e1b7fda..6dcd045 100644
--- a/core/java/android/os/Process.java
+++ b/core/java/android/os/Process.java
@@ -516,11 +516,12 @@ public class Process {
//TODO optionally enable debuger
diff --git a/core/java/com/android/internal/os/ZygoteConnection.java b/core/java/com/android/internal/os/ZygoteConnection.java
-index 85d84bb3f98..81257f0d341 100644
+index 85d84bb..81257f0 100644
--- a/core/java/com/android/internal/os/ZygoteConnection.java
+++ b/core/java/com/android/internal/os/ZygoteConnection.java
@@ -22,6 +22,7 @@ import static android.system.OsConstants.STDERR_FILENO;
break;
}
diff --git a/graphics/java/android/graphics/FontListParser.java b/graphics/java/android/graphics/FontListParser.java
-index 7871aa81dde..f4590c94647 100644
+index 7871aa8..f4590c9 100644
--- a/graphics/java/android/graphics/FontListParser.java
+++ b/graphics/java/android/graphics/FontListParser.java
@@ -21,6 +21,9 @@ import android.util.Xml;
return new Font(fullFilename, index, axes, weight, isItalic);
}
diff --git a/graphics/java/android/graphics/Typeface.java b/graphics/java/android/graphics/Typeface.java
-index 2886f0dd4a2..990c9bd1fbf 100644
+index 2886f0d..990c9bd 100644
--- a/graphics/java/android/graphics/Typeface.java
+++ b/graphics/java/android/graphics/Typeface.java
@@ -17,6 +17,7 @@
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 f4d07aff3e6..5d8ab51d077 100644
+index f4d07af..5d8ab51 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -513,6 +513,8 @@ public final class ActivityManagerService extends ActivityManagerNative
Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);
--
-2.11.1
+2.9.3
-From 9af72eb1074ba8a1fb33fc52ba864da6ae8e30e0 Mon Sep 17 00:00:00 2001
+From 9b60cd4f107e4be9c805c5a56da985de9bde05eb 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/40] N-Extras: AudioService: Allow system effect sounds to
+Subject: [PATCH 26/41] N-Extras: AudioService: Allow system effect sounds to
be themed
This commit checks whether there is a preexisting file in the themed
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;
mediaPlayer.setAudioStreamType(AudioSystem.STREAM_SYSTEM);
mediaPlayer.prepare();
--
-2.11.1
+2.9.3
-From 3d322e1023a90e91d680048352830d0d45029b7e Mon Sep 17 00:00:00 2001
+From 44d05d148e2f64f2a721ff804fbf46ac8478b6da 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/40] OMS7-N: ApplicationsState: add filter for Substratum
+Subject: [PATCH 27/41] OMS7-N: ApplicationsState: add filter for Substratum
overlays [1/2]
This commit allows the framework to handle the filtering of the
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 {
private int mCurrentUser;
--
-2.11.1
+2.9.3
-From e431a19dc79664250960c5f2999a1a167e38d9b3 Mon Sep 17 00:00:00 2001
+From 43daca4255aaa6f333c69740421a311809c652f6 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/40] OMS7-N: ApplicationsState: add filter for Substratum
+Subject: [PATCH 28/41] 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.
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 {
private int mCurrentUser;
--
-2.11.1
+2.9.3
-From 61890b8f9ae1a40414ea3ee6ee4dd7efdcf28f91 Mon Sep 17 00:00:00 2001
+From c602af4461346f83d2abe6c7fe7a1f8541e9f3f9 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/40] Themes: Expose QS battery
+Subject: [PATCH 29/41] Themes: Expose QS battery
This is needed for white themes like Belo. Should function the same with dark themes as well.
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 @@
<com.android.systemui.ResizingSpace
android:layout_width="match_parent"
diff --git a/packages/SystemUI/res/values/projekt_colors.xml b/packages/SystemUI/res/values/projekt_colors.xml
-index 0f891994c9d..83b852416e1 100644
+index 0f89199..83b8524 100644
--- a/packages/SystemUI/res/values/projekt_colors.xml
+++ b/packages/SystemUI/res/values/projekt_colors.xml
@@ -24,4 +24,10 @@
+ <color name="qs_battery_accent">@*android:color/accent_device_default_light</color>
</resources>
--
-2.11.1
+2.9.3
-From b865364d525e3de49006d4f3c9215f8e56be8a9a Mon Sep 17 00:00:00 2001
+From 9ea71ff58bdd4b91adf3a64f9231d93dec3da2d7 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/40] OMS: Introduce MODIFY_OVERLAYS permission for user apps
+Subject: [PATCH 30/41] 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
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 @@
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 1823629..d0923cc 100755
--- a/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml
@@ -1411,6 +1411,11 @@
<!-- Title of policy access to limiting the user's password choices -->
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;
}
--
-2.11.1
+2.9.3
-From 6fe37ff6d1b350b2d891e6832acff1f26addb380 Mon Sep 17 00:00:00 2001
+From 2c2324583fd644b1ae67f1cb82dc2542cdb0cf1a Mon Sep 17 00:00:00 2001
From: daveyannihilation <daveyannihilation@hotmail.com>
Date: Sun, 1 Jan 2017 01:47:53 -0700
-Subject: [PATCH 31/40] SystemUI: Expose switch bar title
+Subject: [PATCH 31/41] SystemUI: Expose switch bar title
This is needed for the power notifications switchbar in SystemUI Tuner, amongst other things.
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 @@
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 @@
+</resources>
+
--
-2.11.1
+2.9.3
-From 092ab8d4eafca7d831427a7490a8f4e48c31ce07 Mon Sep 17 00:00:00 2001
+From 6974958b8cc7d2ceb91c7ff7223f2823f700e368 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/40] Themes: Expose manifest styles for themes
+Subject: [PATCH 32/41] Themes: Expose manifest styles for themes
Change-Id: Ie3a4fdead4f4fa1c121018b38de1c86a05bbcff2
---
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
+index 3ceb17b..36df6ea 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -3214,7 +3214,7 @@
</activity>
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
+index 0000000..e5fe635
--- /dev/null
+++ b/core/res/res/values/projekt_styles.xml
@@ -0,0 +1,41 @@
+
+</resources>
--
-2.11.1
+2.9.3
-From efc4c8d3f3607e4ec91167dde3f0d1adfa424538 Mon Sep 17 00:00:00 2001
+From b532b8fb75627ef3eeb2bf6f01bfe1275febd80c Mon Sep 17 00:00:00 2001
From: mickybart <mickybart@pygoscelis.org>
Date: Sat, 19 Nov 2016 19:05:05 -0500
-Subject: [PATCH 33/40] OMS: StrictMode and files under /data/system/theme/
+Subject: [PATCH 33/41] OMS: StrictMode and files under /data/system/theme/
Themes are using /data/system/theme/ to push some files like LowBattery.ogg (audio notification)
When the device battery trigger the low battery state, the sound is not played due
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/core/java/android/net/Uri.java b/core/java/android/net/Uri.java
-index 67378bd0cd8..4fb189e85c1 100644
+index 67378bd..4fb189e 100644
--- a/core/java/android/net/Uri.java
+++ b/core/java/android/net/Uri.java
@@ -2342,7 +2342,8 @@ public abstract class Uri implements Parcelable, Comparable<Uri> {
}
}
--
-2.11.1
+2.9.3
-From 157bac2359998a275c24edd182d34803e54ed06b Mon Sep 17 00:00:00 2001
+From cc3bfea805430652d7e5a2cefb967e1c4517852a 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/40] doze: allow grayscale even if invert boolean is false
+Subject: [PATCH 34/41] doze: allow grayscale even if invert boolean is false
for dark themes, we are setting the config boolean for inverting
doze notifications to false. in addition to preventing
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/packages/SystemUI/src/com/android/systemui/ViewInvertHelper.java b/packages/SystemUI/src/com/android/systemui/ViewInvertHelper.java
-index 605f381e9e2..16d46c0362e 100644
+index 605f381..16d46c0 100644
--- a/packages/SystemUI/src/com/android/systemui/ViewInvertHelper.java
+++ b/packages/SystemUI/src/com/android/systemui/ViewInvertHelper.java
@@ -92,7 +92,7 @@ public class ViewInvertHelper {
public void setInverted(boolean invert, boolean fade, long delay) {
--
-2.11.1
+2.9.3
-From 01e9e40b810aa271107085c58f0d555cbffd57aa Mon Sep 17 00:00:00 2001
+From 6f4856fb66622c83067a3f2c86fad1d64ba75360 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/40] Expose external qs tile tint color
+Subject: [PATCH 35/41] Expose external qs tile tint color
This should allow themers to get around issues like this (see pic below)
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/packages/SystemUI/res/values/projekt_colors.xml b/packages/SystemUI/res/values/projekt_colors.xml
-index 83b852416e1..e31d1244ac8 100644
+index 83b8524..e31d124 100644
--- a/packages/SystemUI/res/values/projekt_colors.xml
+++ b/packages/SystemUI/res/values/projekt_colors.xml
@@ -30,4 +30,6 @@
+ <color name="external_qs_tile_tint_color">@android:color/white</color>
</resources>
diff --git a/packages/SystemUI/src/com/android/systemui/qs/customize/TileQueryHelper.java b/packages/SystemUI/src/com/android/systemui/qs/customize/TileQueryHelper.java
-index 0cd6490614b..6fabc6101ca 100644
+index 0cd6490..6fabc61 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/customize/TileQueryHelper.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/customize/TileQueryHelper.java
@@ -177,7 +177,7 @@ public class TileQueryHelper {
addTile(spec, icon, label != null ? label.toString() : "null", appLabel, mContext);
}
--
-2.11.1
+2.9.3
-From 1c5290f540e1758ae9d401bc62381e2f53fd64bd Mon Sep 17 00:00:00 2001
+From b9f2673cdd2a0a0128878cd10fb7283c242476ab 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/40] graphics: ADB "N" icon compatible with OMS7
+Subject: [PATCH 36/41] graphics: ADB "N" icon compatible with OMS7
It's the same problem as the booleans again. This time, it affected the adb "N" icon in the statusbar.
This commit should fix this.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/graphics/java/android/graphics/drawable/Icon.java b/graphics/java/android/graphics/drawable/Icon.java
-index 2b950d3d5c5..fb26bee68fa 100644
+index 2b950d3..fb26bee 100644
--- a/graphics/java/android/graphics/drawable/Icon.java
+++ b/graphics/java/android/graphics/drawable/Icon.java
@@ -294,7 +294,7 @@ public final class Icon implements Parcelable {
final PackageManager pm = context.getPackageManager();
try {
--
-2.11.1
+2.9.3
-From f03071d62a2a2b7394bcfd5f01cb66d805600a73 Mon Sep 17 00:00:00 2001
+From ecddd70ad7cff4fcd49d492dec4cc1fb290e0749 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/40] Set external QS tiles tint mode to SRC_ATOP
+Subject: [PATCH 37/41] Set external QS tiles tint mode to SRC_ATOP
While the external qs tile tint color was exposed, we had the same problem
we had with the external icons in Settings which is if a themer set the color
1 file changed, 2 insertions(+)
diff --git a/packages/SystemUI/src/com/android/systemui/qs/customize/TileQueryHelper.java b/packages/SystemUI/src/com/android/systemui/qs/customize/TileQueryHelper.java
-index 6fabc6101ca..dbdb614c8e1 100644
+index 6fabc61..dbdb614 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/customize/TileQueryHelper.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/customize/TileQueryHelper.java
@@ -23,6 +23,7 @@ import android.content.Context;
addTile(spec, icon, label != null ? label.toString() : "null", appLabel, mContext);
}
--
-2.11.1
+2.9.3
-From 3ffb6b8d661bbc5cec942d161eb5e95cb81d1188 Mon Sep 17 00:00:00 2001
+From bc0ea1ef67109a58132d7db397df60e4f0e2b249 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/40] Themes: Expose Keyguard affordance circle background
+Subject: [PATCH 38/41] Themes: Expose Keyguard affordance circle background
Change-Id: Id4a078cdbc944fa0c0736103045a0382d49ecb80
---
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/packages/SystemUI/res/values/projekt_colors.xml b/packages/SystemUI/res/values/projekt_colors.xml
-index e31d1244ac8..e8f8e502845 100644
+index e31d124..e8f8e50 100644
--- a/packages/SystemUI/res/values/projekt_colors.xml
+++ b/packages/SystemUI/res/values/projekt_colors.xml
@@ -32,4 +32,6 @@
+ <color name="keyguard_affordance_circle_background">@android:color/white</color>
</resources>
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardAffordanceView.java b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardAffordanceView.java
-index b94df1d5819..3d661b781b8 100644
+index b94df1d..3d661b7 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardAffordanceView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardAffordanceView.java
@@ -131,7 +131,7 @@ public class KeyguardAffordanceView extends ImageView implements Palette.Palette
mNormalColor = 0xffffffff;
--
-2.11.1
+2.9.3
-From 5efea188dbef1496f10188344973461bc27d3a8d Mon Sep 17 00:00:00 2001
+From 154164cf68848d26779851d41b6062ebdd2dc566 Mon Sep 17 00:00:00 2001
From: SpiritCroc <spiritcroc@gmail.com>
Date: Sun, 5 Feb 2017 12:00:54 +0100
-Subject: [PATCH 39/40] Notification tint: add optional findContrastColor
+Subject: [PATCH 39/41] Notification tint: add optional findContrastColor
algorithm for dark backgrounds
Overlay config_useDarkBgNotificationIconTextTinting to enable dark bg tinting
3 files changed, 68 insertions(+), 2 deletions(-)
diff --git a/core/java/com/android/internal/util/NotificationColorUtil.java b/core/java/com/android/internal/util/NotificationColorUtil.java
-index 4748e6fb19f..bbc9a24b1ed 100644
+index 4748e6f..bbc9a24 100644
--- a/core/java/com/android/internal/util/NotificationColorUtil.java
+++ b/core/java/com/android/internal/util/NotificationColorUtil.java
@@ -37,6 +37,8 @@ import android.text.style.TextAppearanceSpan;
if (color != resolvedColor) {
if (DEBUG){
diff --git a/core/res/res/values/projekt_config.xml b/core/res/res/values/projekt_config.xml
-index 5234959fc9e..8cf5666a7e4 100644
+index 5234959..8cf5666 100644
--- a/core/res/res/values/projekt_config.xml
+++ b/core/res/res/values/projekt_config.xml
@@ -27,4 +27,8 @@
+
</resources>
diff --git a/core/res/res/values/projekt_symbols.xml b/core/res/res/values/projekt_symbols.xml
-index 16a5728e6c9..faa71e064e6 100644
+index 16a5728..faa71e0 100644
--- a/core/res/res/values/projekt_symbols.xml
+++ b/core/res/res/values/projekt_symbols.xml
@@ -19,6 +19,7 @@
<java-symbol type="color" name="sender_text_color" />
--
-2.11.1
+2.9.3
-From 027b97fdde6cb61f47ccf26aa1223c903c0b7704 Mon Sep 17 00:00:00 2001
+From 3e7aa0c9eb4e2b82a8d20e843ad3b77cfff66ebd Mon Sep 17 00:00:00 2001
From: bigrushdog <randall.rushing@gmail.com>
Date: Sat, 14 Jan 2017 23:33:38 -0800
-Subject: [PATCH 40/40] Add a protected broadcast for Masquerade events
+Subject: [PATCH 40/41] Add a protected broadcast for Masquerade events
Parse extras to get event details. Docs will be available
in Masquerade source code
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
-index 36df6eac13e..768b04c86c5 100644
+index 36df6ea..768b04c 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -517,6 +517,8 @@
<!-- RUNTIME PERMISSIONS -->
<!-- ====================================================================== -->
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
-index faaff1f08a2..79032a915ca 100644
+index faaff1f..79032a9 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -4568,7 +4568,8 @@ public class PackageManagerService extends IPackageManager.Stub {
}
}
--
-2.11.1
+2.9.3
--- /dev/null
+From 31f81ddb83f6546de3aa79688b29302c6624b779 Mon Sep 17 00:00:00 2001
+From: Evan Anderson <evananderson@aospa.co>
+Date: Mon, 27 Feb 2017 15:16:18 -0500
+Subject: [PATCH 41/41] OMS: Add hide annotation to MODIFY_OVERLAYS permission
+
+* Modifications in this file affect the public API, so we must hide our
+ additions to build in release mode
+
+Change-Id: I03c73f3d6a420ceda42c3241858427938d0a5fad
+Signed-off-by: Evan Anderson <evananderson@aospa.co>
+---
+ core/res/AndroidManifest.xml | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
+index 768b04c..e4eeedf 100644
+--- a/core/res/AndroidManifest.xml
++++ b/core/res/AndroidManifest.xml
+@@ -3164,7 +3164,8 @@
+ <permission android:name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME"
+ android:protectionLevel="signature|privileged" />
+
+- <!-- Allows an application to make calls to OverlayManagerService.-->
++ <!-- Allows an application to make calls to OverlayManagerService.
++ @hide -->
+ <permission android:name="android.permission.MODIFY_OVERLAYS"
+ android:label="@string/permlab_modifyOverlays"
+ android:description="@string/permdesc_modifyOverlays"
+--
+2.9.3
+
-From 1f53add2077b2573b7d6b4d761b48f8505bb3701 Mon Sep 17 00:00:00 2001
+From 34f415cf87f857d4ce1426c60c784dcb417aa227 Mon Sep 17 00:00:00 2001
From: bgill55 <bricam55@gmail.com>
Date: Sat, 24 Jan 2015 18:12:39 -0700
-Subject: [PATCH] Themes: Expose hardcoded contact tile text colors
+Subject: [PATCH 1/2] Themes: Expose hardcoded contact tile text colors
Naming conventions in line with @daveyannihilation's commit
https://github.com/daveyannihilation/Theme-Ready-Google-Contacts/commit/dedf7925f52bec3896b138fa3d9f3754218abb2d
--- /dev/null
+From 359630888f09069f9bad56dfc88102655025da6d Mon Sep 17 00:00:00 2001
+From: Bryan Owens <djbryan3540@gmail.com>
+Date: Fri, 11 Dec 2015 22:04:15 -0600
+Subject: [PATCH 2/2] Themes: Define back arrow tint color for themes
+
+This will make it easier to theme and keep stock look
+
+Change-Id: I0385f7773a988c08e41acc1fd54bf32d13e0cddd
+Signed-off-by: Bryan Owens <djbryan3540@gmail.com>
+---
+ res/layout/search_bar_expanded.xml | 2 +-
+ res/values/projekt_colors.xml | 1 +
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/res/layout/search_bar_expanded.xml b/res/layout/search_bar_expanded.xml
+index c530299..e5e180a 100644
+--- a/res/layout/search_bar_expanded.xml
++++ b/res/layout/search_bar_expanded.xml
+@@ -30,7 +30,7 @@
+ android:src="@drawable/ic_back_arrow"
+ android:background="?android:attr/selectableItemBackgroundBorderless"
+ android:contentDescription="@string/action_menu_back_from_search"
+- android:tint="@color/actionbar_background_color" />
++ android:tint="@color/back_arrow_icon_tint_color" />
+
+ <EditText
+ android:id="@+id/search_view"
+diff --git a/res/values/projekt_colors.xml b/res/values/projekt_colors.xml
+index a5d6bd3..07d6963 100644
+--- a/res/values/projekt_colors.xml
++++ b/res/values/projekt_colors.xml
+@@ -19,4 +19,5 @@
+ <color name="frequent_contact_text_color">@android:color/black</color>
+ <color name="contact_tile_text_color">#ff202020</color>
+ <color name="starred_quick_contact_name_text_color">@android:color/white</color>
++ <color name="back_arrow_icon_tint_color">@color/actionbar_background_color</color>
+ </resources>
+--
+2.9.3
+
--- /dev/null
+From 2d18a64b8297a4cae1e97dcab6332118b1e99d0d Mon Sep 17 00:00:00 2001
+From: Alex Cruz <mazdarider23@gmail.com>
+Date: Thu, 5 May 2016 11:55:05 -0500
+Subject: [PATCH 1/2] Themes: Separate background color from text color
+
+Change-Id: I19e55b64e34cb069f1967a900fd19b118c392244
+---
+ res/layout/voicemail_promo_card.xml | 4 ++--
+ res/values/projekt_colors.xml | 20 ++++++++++++++++++++
+ 2 files changed, 22 insertions(+), 2 deletions(-)
+ create mode 100644 res/values/projekt_colors.xml
+
+diff --git a/res/layout/voicemail_promo_card.xml b/res/layout/voicemail_promo_card.xml
+index ba4ac59..9dc7850 100644
+--- a/res/layout/voicemail_promo_card.xml
++++ b/res/layout/voicemail_promo_card.xml
+@@ -46,7 +46,7 @@
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="@dimen/promo_card_title_padding"
+ android:layout_gravity="center_vertical"
+- android:textColor="@color/background_dialer_white"
++ android:textColor="@color/promo_card_header_text_color"
+ android:textSize="@dimen/call_log_primary_text_size"
+ android:textStyle="bold"
+ android:text="@string/visual_voicemail_title"
+@@ -56,7 +56,7 @@
+ android:id="@+id/promo_card_details"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+- android:textColor="@color/background_dialer_white"
++ android:textColor="@color/promo_card_details_text_color"
+ android:textSize="@dimen/call_log_detail_text_size"
+ android:text="@string/visual_voicemail_text"
+ android:lineSpacingExtra="@dimen/promo_card_line_spacing"
+diff --git a/res/values/projekt_colors.xml b/res/values/projekt_colors.xml
+new file mode 100644
+index 0000000..a5f4aa9
+--- /dev/null
++++ b/res/values/projekt_colors.xml
+@@ -0,0 +1,20 @@
++<?xml version="1.0" encoding="utf-8"?>
++<!--
++ Copyright (C) 2016 Projekt Substratum
++
++ Licensed under the Apache License, Version 2.0 (the "License");
++ you may not use this file except in compliance with the License.
++ You may obtain a copy of the License at
++
++ http://www.apache.org/licenses/LICENSE-2.0
++
++ Unless required by applicable law or agreed to in writing, software
++ distributed under the License is distributed on an "AS IS" BASIS,
++ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++ See the License for the specific language governing permissions and
++ limitations under the License.
++-->
++<resources>
++ <color name="promo_card_header_text_color">@color/background_dialer_white</color>
++ <color name="promo_card_details_text_color">@color/background_dialer_white</color>
++</resources>
+--
+2.9.3
+
--- /dev/null
+From 377d7dc8d57e9bd58ac184ecdf3af670d7a0ac01 Mon Sep 17 00:00:00 2001
+From: George G <kreach3r@users.noreply.github.com>
+Date: Mon, 14 Nov 2016 16:05:32 +0200
+Subject: [PATCH 2/2] Themes: InCallUI dialpad digits color
+
+11/2016: Port to Nougat's Dialer (from marshmallow's InCallUI) by KreAch3R
+
+InCallUI's dialpad digits (not the digits' text) color is linked to the InCallUI theme primary color, on runtime. This is coded as such because Google wanted to update the InCallUI's theme (primary and primary-dark) colors in MSIM devices on the fly, based on which SIM card was used to make the call.
+This commit:
+* makes this behavior configurable by a boolean
+* links the digits color to a color value
+
+This way, the default behavior is preserved. The themer has to set the "config_dialpadDigitsStaticColor" boolean to true, in order to theme the color value. If he doesn't change the boolean, the default behavior is preserved and the digits color works as Google wanted.
+
+Change-Id: I9fc18dc5068f8bab90fbe8b5cfc608f0500a09c8
+---
+ .../src/com/android/incallui/DialpadFragment.java | 4 ++++
+ res/values/projekt_colors.xml | 1 +
+ res/values/projekt_config.xml | 20 ++++++++++++++++++++
+ 3 files changed, 25 insertions(+)
+ create mode 100644 res/values/projekt_config.xml
+
+diff --git a/InCallUI/src/com/android/incallui/DialpadFragment.java b/InCallUI/src/com/android/incallui/DialpadFragment.java
+index ad288bd..38e3d8f 100644
+--- a/InCallUI/src/com/android/incallui/DialpadFragment.java
++++ b/InCallUI/src/com/android/incallui/DialpadFragment.java
+@@ -455,6 +455,10 @@ public class DialpadFragment extends BaseFragment<DialpadPresenter, DialpadPrese
+
+ public void updateColors() {
+ int textColor = InCallPresenter.getInstance().getThemeColors().mPrimaryColor;
++ // Disable dynamic digits color, for better theme compatibility
++ if (getContext().getResources().getBoolean(R.bool.config_dialpadDigitsStaticColor)) {
++ textColor = getContext().getResources().getColor(R.color.dialpad_digits_color);
++ }
+
+ if (mCurrentTextColor == textColor) {
+ return;
+diff --git a/res/values/projekt_colors.xml b/res/values/projekt_colors.xml
+index a5f4aa9..a894291 100644
+--- a/res/values/projekt_colors.xml
++++ b/res/values/projekt_colors.xml
+@@ -17,4 +17,5 @@
+ <resources>
+ <color name="promo_card_header_text_color">@color/background_dialer_white</color>
+ <color name="promo_card_details_text_color">@color/background_dialer_white</color>
++ <color name="dialpad_digits_color">@color/incall_background_color</color>
+ </resources>
+diff --git a/res/values/projekt_config.xml b/res/values/projekt_config.xml
+new file mode 100644
+index 0000000..1f61f12
+--- /dev/null
++++ b/res/values/projekt_config.xml
+@@ -0,0 +1,20 @@
++<?xml version="1.0" encoding="utf-8"?>
++<!--
++ Copyright (c) 2016 Project Substratum
++
++ Licensed under the Apache License, Version 2.0 (the "License");
++ you may not use this file except in compliance with the License.
++ You may obtain a copy of the License at
++
++ http://www.apache.org/licenses/LICENSE-2.0
++
++ Unless required by applicable law or agreed to in writing, software
++ distributed under the License is distributed on an "AS IS" BASIS,
++ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++ See the License for the specific language governing permissions and
++ limitations under the License.
++-->
++
++<resources>
++ <bool name="config_dialpadDigitsStaticColor">false</bool>
++</resources>
+--
+2.9.3
+
-From 08077a058b0fd201349658f91bcb101e81f7753c Mon Sep 17 00:00:00 2001
+From 48b1e9e4ec59e58caede2f767f38d913dec192e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A5rten=20Kongstad?= <marten.kongstad@sonymobile.com>
Date: Mon, 22 Jun 2015 09:31:25 +0200
-Subject: [PATCH 1/4] OMS-N: Add service 'overlay' to service_contexts
+Subject: [PATCH 1/7] OMS-N: Add service 'overlay' to service_contexts
The 'overlay' service is the Overlay Manager Service, which tracks
packages and their Runtime Resource Overlay overlay packages.
allow system_server system_server_service:service_manager { add find };
allow system_server surfaceflinger_service:service_manager find;
--
-2.11.1
+2.9.3
-From b836271c4a20b21b087aad4b320cc2c3ac0a37c2 Mon Sep 17 00:00:00 2001
+From adc92468ee663265bb3dde82647cb91b8511016c Mon Sep 17 00:00:00 2001
From: d34d <clark@cyngn.com>
Date: Wed, 4 Jan 2017 10:29:34 -0800
-Subject: [PATCH 2/4] Introduce sepolicy exceptions for theme assets
+Subject: [PATCH 2/7] Introduce sepolicy exceptions for theme assets
Assets such as composed icons and ringtones need to be accessed
by apps. This patch adds the policy needed to facilitate this.
+# Themes
+type theme_data_file, file_type, data_file_type;
diff --git a/file_contexts b/file_contexts
-index 3d91e2b..dc8bddf 100644
+index 3448f21..392e655 100644
--- a/file_contexts
+++ b/file_contexts
-@@ -400,3 +400,6 @@
+@@ -401,3 +401,6 @@
/mnt/user(/.*)? u:object_r:mnt_user_file:s0
/mnt/runtime(/.*)? u:object_r:storage_file:s0
/storage(/.*)? u:object_r:storage_file:s0
+allow zygote theme_data_file:file r_file_perms;
+allow zygote theme_data_file:dir r_dir_perms;
--
-2.11.1
+2.9.3
-From cc9b51faf3c84e06991c75527de291fd6dca5298 Mon Sep 17 00:00:00 2001
+From e900b51625d328268f2eeecb7e83aab899b550e5 Mon Sep 17 00:00:00 2001
From: bigrushdog <randall.rushing@gmail.com>
Date: Wed, 4 Jan 2017 10:31:29 -0800
-Subject: [PATCH 3/4] sepolicy: fix themed boot animation
+Subject: [PATCH 3/7] sepolicy: fix themed boot animation
W BootAnimation: type=1400 audit(0.0:42): avc: denied { open } for uid=1003 path="/data/system/theme/bootanimation.zip" dev="mmcblk0p42" ino=1657697 scontext=u:r:bootanim:s0 tcontext=u:object_r:system_data_file:s0 tclass=file permissive=0
allow bootanim theme_data_file:file r_file_perms;
+allow bootanim system_data_file:file open;
--
-2.11.1
+2.9.3
-From 79f278bf75d1196b1e332889eeddd3755b7cbfac Mon Sep 17 00:00:00 2001
+From 51dc94d1fa1d5ab2b2743baa943805ad80fcb463 Mon Sep 17 00:00:00 2001
From: George G <kreach3r@users.noreply.github.com>
Date: Wed, 8 Feb 2017 17:22:44 +0200
-Subject: [PATCH 4/4] sepolicy: fix themed sounds
+Subject: [PATCH 4/7] sepolicy: fix themed sounds
02-08 17:26:48.011 18259-18259/? W/SoundPoolThread: type=1400 audit(0.0:31): avc: denied { read } for path="/data/system/theme/audio/ui/Lock.ogg" dev="dm-0" ino=1006317 scontext=u:r:drmserver:s0 tcontext=u:object_r:theme_data_file:s0 tclass=file permissive=0
+allow drmserver theme_data_file:dir r_dir_perms;
+allow drmserver theme_data_file:file r_file_perms;
--
-2.11.1
+2.9.3
--- /dev/null
+From 6835036b16a0400b5b38d2c35a7517e2e24af2a1 Mon Sep 17 00:00:00 2001
+From: Surge1223 <surge1223@gmail.com>
+Date: Sat, 18 Feb 2017 08:46:15 -0600
+Subject: [PATCH 5/7] initial policy edits for masquerade to operate rootless
+
+Change-Id: Iddfc408f206033772b9d49d335ca94e63b5e5210
+---
+ app.te | 2 +-
+ domain.te | 2 ++
+ masquerade.te | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
+ seapp_contexts | 1 +
+ untrusted_app.te | 3 +++
+ 5 files changed, 57 insertions(+), 1 deletion(-)
+ create mode 100644 masquerade.te
+
+diff --git a/app.te b/app.te
+index 3a2878d..661f67f 100644
+--- a/app.te
++++ b/app.te
+@@ -374,7 +374,7 @@ neverallow appdomain exec_type:file
+ # This is the default type for anything under /data not otherwise
+ # specified in file_contexts. Define a different type for portions
+ # that should be writable by apps.
+-neverallow appdomain system_data_file:dir_file_class_set
++neverallow { appdomain -masquerade_app } system_data_file:dir_file_class_set
+ { create write setattr relabelfrom relabelto append unlink link rename };
+
+ # Write to various other parts of /data.
+diff --git a/domain.te b/domain.te
+index a74833c..b18bfa7 100644
+--- a/domain.te
++++ b/domain.te
+@@ -381,6 +381,7 @@ neverallow {
+ -init # TODO: limit init to relabelfrom for files
+ -zygote
+ -installd
++ -masquerade_app
+ -postinstall_dexopt
+ -cppreopts
+ -dex2oat
+@@ -487,6 +488,7 @@ neverallow {
+ -system_server
+ -system_app
+ -init
++ -masquerade_app
+ -installd # for relabelfrom and unlink, check for this in explicit neverallow
+ } system_data_file:file no_w_file_perms;
+ # do not grant anything greater than r_file_perms and relabelfrom unlink
+diff --git a/masquerade.te b/masquerade.te
+new file mode 100644
+index 0000000..433448a
+--- /dev/null
++++ b/masquerade.te
+@@ -0,0 +1,50 @@
++#
++# Masquerade needs additional permissions when not running with system_server
++# masquerade.substratum.
++#
++#
++type masquerade_app, domain;
++
++# Add masquerade to domains
++net_domain(masquerade_app)
++app_domain(masquerade_app)
++binder_service(masquerade_app)
++
++# Modify system dalvik-cache
++allow masquerade_app dalvikcache_data_file:file { getattr open read };
++allow masquerade_app dalvikcache_data_file:dir { getattr search };
++
++# Read and write /data/data subdirectory.
++allow masquerade_app system_app_data_file:dir create_dir_perms;
++allow masquerade_app system_app_data_file:{ file lnk_file } create_file_perms;
++
++# /data/resource-cache
++allow masquerade_app resourcecache_data_file:file r_file_perms;
++allow masquerade_app resourcecache_data_file:dir r_dir_perms;
++
++# Read wallpaper file.
++allow masquerade_app wallpaper_file:file r_file_perms;
++
++# Read icon file.
++allow masquerade_app icon_file:file r_file_perms;
++
++# Set bootanimation
++allow masquerade_app bootanim:process { getsched setsched };
++
++# Backup of wallpaper imagery uses temporary hard links to avoid data churn
++allow masquerade_app { system_data_file wallpaper_file }:file link;
++
++# Manage ringtones.
++allow masquerade_app ringtone_file:dir { create_dir_perms relabelto };
++allow masquerade_app ringtone_file:file create_file_perms;
++
++# Manage overlays
++allow masquerade_app overlay_service:service_manager find;
++
++# System file accesses.
++allow masquerade_app system_file:dir r_dir_perms;
++allow masquerade_app system_file:dir rmdir;
++allow masquerade_app kernel:system module_request;
++allow masquerade_app dalvikcache_data_file:file { setattr write };
++allow masquerade_app system_data_file:dir { add_name create rmdir remove_name setattr write };
++allow masquerade_app system_data_file:file { create getattr setattr unlink write };
+diff --git a/seapp_contexts b/seapp_contexts
+index 5d5ad75..85303d0 100644
+--- a/seapp_contexts
++++ b/seapp_contexts
+@@ -97,3 +97,4 @@ user=_app seinfo=platform domain=platform_app type=app_data_file levelFrom=user
+ user=_app isAutoPlayApp=true domain=autoplay_app type=autoplay_data_file levelFrom=all
+ user=_app isPrivApp=true domain=priv_app type=app_data_file levelFrom=user
+ user=_app domain=untrusted_app type=app_data_file levelFrom=user
++user=system isPrivApp=true domain=masquerade_app seinfo=platform name=masquerade.substratum type=system_app_data_file
+diff --git a/untrusted_app.te b/untrusted_app.te
+index b9a72ed..c2a5320 100644
+--- a/untrusted_app.te
++++ b/untrusted_app.te
+@@ -110,6 +110,9 @@ allow untrusted_app sysfs_hwrandom:file r_file_perms;
+ allow untrusted_app preloads_data_file:dir r_dir_perms;
+ allow untrusted_app preloads_data_file:file r_file_perms;
+
++# Allow AOPT to call module_request
++allow untrusted_app kernel:system module_request;
++
+ ###
+ ### neverallow rules
+ ###
+--
+2.9.3
+
--- /dev/null
+From 857ed4080b52eae82ad51c038894d3df009bbd1c Mon Sep 17 00:00:00 2001
+From: Surge1223 <surge1223@gmail.com>
+Date: Tue, 21 Feb 2017 12:28:05 -0600
+Subject: [PATCH 6/7] sepolicy: rename masquerade domain and allow JobService
+ in system_server
+
+This attempts to address the issue of JobService being unable to process
+overlays when selinux is set to enforcing.
+
+I ActivityManager: Start proc 7323:masquerade.substratum/1000 for service
+masquerade.substratum/.services.JobService
+I ActivityManager: Setting hasTopUi=true for pid=1473
+D PhoneStatusBar: disable: < expand ICONS* alerts SYSTEM_INFO* back home recent clock search quick_settings
+E SELinux : avc: denied { find } for service=activity pid=7323 uid=1000
+scontext=u:r:masquerade_app:s0tcontext=u:object_r:activity_service:s0 tclass=service_manager permissive=0
+D AndroidRuntime: Shutting down VM
+E AndroidRuntime: FATAL EXCEPTION: main
+E AndroidRuntime: PID: 7323
+
+Change-Id: Ia274f14a2fdb77970b3142f4587036502943882c
+---
+ app.te | 2 +-
+ domain.te | 4 ++--
+ masquerade.te | 49 +++++++++++++++++++++++++------------------------
+ seapp_contexts | 2 +-
+ service.te | 1 +
+ service_contexts | 1 +
+ system_server.te | 1 +
+ 7 files changed, 32 insertions(+), 28 deletions(-)
+
+diff --git a/app.te b/app.te
+index 661f67f..e6180e3 100644
+--- a/app.te
++++ b/app.te
+@@ -374,7 +374,7 @@ neverallow appdomain exec_type:file
+ # This is the default type for anything under /data not otherwise
+ # specified in file_contexts. Define a different type for portions
+ # that should be writable by apps.
+-neverallow { appdomain -masquerade_app } system_data_file:dir_file_class_set
++neverallow { appdomain -masquerade } system_data_file:dir_file_class_set
+ { create write setattr relabelfrom relabelto append unlink link rename };
+
+ # Write to various other parts of /data.
+diff --git a/domain.te b/domain.te
+index b18bfa7..5bc5fcb 100644
+--- a/domain.te
++++ b/domain.te
+@@ -381,7 +381,7 @@ neverallow {
+ -init # TODO: limit init to relabelfrom for files
+ -zygote
+ -installd
+- -masquerade_app
++ -masquerade
+ -postinstall_dexopt
+ -cppreopts
+ -dex2oat
+@@ -488,7 +488,7 @@ neverallow {
+ -system_server
+ -system_app
+ -init
+- -masquerade_app
++ -masquerade
+ -installd # for relabelfrom and unlink, check for this in explicit neverallow
+ } system_data_file:file no_w_file_perms;
+ # do not grant anything greater than r_file_perms and relabelfrom unlink
+diff --git a/masquerade.te b/masquerade.te
+index 433448a..949699c 100644
+--- a/masquerade.te
++++ b/masquerade.te
+@@ -3,48 +3,49 @@
+ # masquerade.substratum.
+ #
+ #
+-type masquerade_app, domain;
++type masquerade, domain;
+
+ # Add masquerade to domains
+-net_domain(masquerade_app)
+-app_domain(masquerade_app)
+-binder_service(masquerade_app)
++net_domain(masquerade)
++app_domain(masquerade)
++binder_service(masquerade)
+
+ # Modify system dalvik-cache
+-allow masquerade_app dalvikcache_data_file:file { getattr open read };
+-allow masquerade_app dalvikcache_data_file:dir { getattr search };
++allow masquerade dalvikcache_data_file:file { getattr open read };
++allow masquerade dalvikcache_data_file:dir { getattr search };
+
+ # Read and write /data/data subdirectory.
+-allow masquerade_app system_app_data_file:dir create_dir_perms;
+-allow masquerade_app system_app_data_file:{ file lnk_file } create_file_perms;
++allow masquerade system_app_data_file:dir create_dir_perms;
++allow masquerade system_app_data_file:{ file lnk_file } create_file_perms;
+
+ # /data/resource-cache
+-allow masquerade_app resourcecache_data_file:file r_file_perms;
+-allow masquerade_app resourcecache_data_file:dir r_dir_perms;
++allow masquerade resourcecache_data_file:file r_file_perms;
++allow masquerade resourcecache_data_file:dir r_dir_perms;
+
+ # Read wallpaper file.
+-allow masquerade_app wallpaper_file:file r_file_perms;
++allow masquerade wallpaper_file:file r_file_perms;
+
+ # Read icon file.
+-allow masquerade_app icon_file:file r_file_perms;
++allow masquerade icon_file:file r_file_perms;
+
+ # Set bootanimation
+-allow masquerade_app bootanim:process { getsched setsched };
++allow masquerade bootanim:process { getsched setsched };
+
+ # Backup of wallpaper imagery uses temporary hard links to avoid data churn
+-allow masquerade_app { system_data_file wallpaper_file }:file link;
++allow masquerade { system_data_file wallpaper_file }:file link;
+
+ # Manage ringtones.
+-allow masquerade_app ringtone_file:dir { create_dir_perms relabelto };
+-allow masquerade_app ringtone_file:file create_file_perms;
++allow masquerade ringtone_file:dir { create_dir_perms relabelto };
++allow masquerade ringtone_file:file create_file_perms;
+
+-# Manage overlays
+-allow masquerade_app overlay_service:service_manager find;
++# Manage overlays and start JobService
++allow masquerade overlay_service:service_manager find;
++allow masquerade activity_service:service_manager find;
+
+ # System file accesses.
+-allow masquerade_app system_file:dir r_dir_perms;
+-allow masquerade_app system_file:dir rmdir;
+-allow masquerade_app kernel:system module_request;
+-allow masquerade_app dalvikcache_data_file:file { setattr write };
+-allow masquerade_app system_data_file:dir { add_name create rmdir remove_name setattr write };
+-allow masquerade_app system_data_file:file { create getattr setattr unlink write };
++allow masquerade system_file:dir r_dir_perms;
++allow masquerade system_file:dir rmdir;
++allow masquerade kernel:system module_request;
++allow masquerade dalvikcache_data_file:file { setattr write };
++allow masquerade system_data_file:dir { add_name create rmdir remove_name setattr write };
++allow masquerade system_data_file:file { create getattr setattr unlink write read };
+diff --git a/seapp_contexts b/seapp_contexts
+index 85303d0..bbf8b78 100644
+--- a/seapp_contexts
++++ b/seapp_contexts
+@@ -97,4 +97,4 @@ user=_app seinfo=platform domain=platform_app type=app_data_file levelFrom=user
+ user=_app isAutoPlayApp=true domain=autoplay_app type=autoplay_data_file levelFrom=all
+ user=_app isPrivApp=true domain=priv_app type=app_data_file levelFrom=user
+ user=_app domain=untrusted_app type=app_data_file levelFrom=user
+-user=system isPrivApp=true domain=masquerade_app seinfo=platform name=masquerade.substratum type=system_app_data_file
++user=system isPrivApp=true domain=masquerade seinfo=platform name=masquerade.substratum type=system_app_data_file
+diff --git a/service.te b/service.te
+index 6f9ab3f..efa08e7 100644
+--- a/service.te
++++ b/service.te
+@@ -68,6 +68,7 @@ type jobscheduler_service, app_api_service, system_server_service, service_manag
+ type launcherapps_service, app_api_service, system_server_service, service_manager_type;
+ type location_service, app_api_service, system_server_service, service_manager_type;
+ type lock_settings_service, system_api_service, system_server_service, service_manager_type;
++type masquerade_service, app_api_service, system_server_service, service_manager_type;
+ type media_projection_service, app_api_service, system_server_service, service_manager_type;
+ type media_router_service, app_api_service, system_server_service, service_manager_type;
+ type media_session_service, app_api_service, system_server_service, service_manager_type;
+diff --git a/service_contexts b/service_contexts
+index b7d7473..b831312 100644
+--- a/service_contexts
++++ b/service_contexts
+@@ -65,6 +65,7 @@ jobscheduler u:object_r:jobscheduler_service:s0
+ launcherapps u:object_r:launcherapps_service:s0
+ location u:object_r:location_service:s0
+ lock_settings u:object_r:lock_settings_service:s0
++masquerade u:object_r:masquerade_service:s0
+ media.audio_flinger u:object_r:audioserver_service:s0
+ media.audio_policy u:object_r:audioserver_service:s0
+ media.camera u:object_r:cameraserver_service:s0
+diff --git a/system_server.te b/system_server.te
+index 3ca8182..5e2a3a8 100644
+--- a/system_server.te
++++ b/system_server.te
+@@ -435,6 +435,7 @@ allow system_server batteryproperties_service:service_manager find;
+ allow system_server keystore_service:service_manager find;
+ allow system_server gatekeeper_service:service_manager find;
+ allow system_server fingerprintd_service:service_manager find;
++allow system_server masquerade_service:service_manager find;
+ allow system_server mediaserver_service:service_manager find;
+ allow system_server mediaextractor_service:service_manager find;
+ allow system_server mediacodec_service:service_manager find;
+--
+2.9.3
+
--- /dev/null
+From 81312f4a922b43ff64ab3dd527b3964435e89abe Mon Sep 17 00:00:00 2001
+From: Surge1223 <surge1223@gmail.com>
+Date: Wed, 22 Feb 2017 20:45:04 -0600
+Subject: [PATCH 7/7] sepolicy: allow masquerade to read and write theme assets
+
+Fix for masquerade to handle theme assets including fonts and bootanimation, also
+takes into account when /data/system/theme doesnt exist
+
+SELinux : avc: denied { find } for service=display pid=10652 uid=1000 scontext=u:r:masquerade:s0
+tcontext=u:object_r:display_service:s0 tclass=service_manager permissive=0
+
+Change-Id: I1136f9965a85d9c9f19827200e61e4d1c9724593
+---
+ masquerade.te | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/masquerade.te b/masquerade.te
+index 949699c..2f17030 100644
+--- a/masquerade.te
++++ b/masquerade.te
+@@ -49,3 +49,15 @@ allow masquerade kernel:system module_request;
+ allow masquerade dalvikcache_data_file:file { setattr write };
+ allow masquerade system_data_file:dir { add_name create rmdir remove_name setattr write };
+ allow masquerade system_data_file:file { create getattr setattr unlink write read };
++
++# Allow handling of theme assets
++allow masquerade theme_data_file:dir { add_name create remove_name setattr write rmdir };
++allow masquerade theme_data_file:file { create setattr write unlink };
++
++# Modify system properties
++allow masquerade init:unix_stream_socket connectto;
++allow masquerade mount_service:service_manager find;
++allow masquerade property_socket:sock_file write;
++allow masquerade system_prop:property_service set;
++allow masquerade connectivity_service:service_manager find;
++allow masquerade display_service:service_manager find;
+--
+2.9.3
+
projects / GitHub / Stricted / android_vendor_extra.git / commitdiff