Changes for p
diff --git a/patches/platform_frameworks_base/0002-Reintroduce-button-backlight-and-respective-inactivi.patch b/patches/platform_frameworks_base/0001-Reintroduce-button-backlight-and-respective-inactivi.patch
similarity index 77%
rename from patches/platform_frameworks_base/0002-Reintroduce-button-backlight-and-respective-inactivi.patch
rename to patches/platform_frameworks_base/0001-Reintroduce-button-backlight-and-respective-inactivi.patch
index eeb693f..ab99e6f 100644
--- a/patches/platform_frameworks_base/0002-Reintroduce-button-backlight-and-respective-inactivi.patch
+++ b/patches/platform_frameworks_base/0001-Reintroduce-button-backlight-and-respective-inactivi.patch
@@ -1,7 +1,7 @@
-From 1672d35b1d213d54adf7ef20bcc6344683e0969f Mon Sep 17 00:00:00 2001
+From 69d58167da745a41f6f6ef644cee1fc1ceb69376 Mon Sep 17 00:00:00 2001
From: Ricardo Cerqueira <cyanogenmod@cerqueira.org>
Date: Fri, 23 Nov 2012 14:23:16 +0000
-Subject: [PATCH 02/16] Reintroduce button-backlight (and respective inactivity
+Subject: [PATCH 01/14] Reintroduce button-backlight (and respective inactivity
timeout)
The power manager rewrite from Change I1d7a52e98f0449f76d70bf421f6a7f245957d1d7
@@ -14,12 +14,12 @@
Change-Id: I6094c446e0b8c23f57d30652a3cbd35dee5e821a
---
- .../com/android/server/display/DisplayPowerController.java | 11 +++++++++++
- .../java/com/android/server/power/PowerManagerService.java | 10 ++++++++++
+ .../server/display/DisplayPowerController.java | 11 +++++++++++
+ .../com/android/server/power/PowerManagerService.java | 10 ++++++++++
2 files changed, 21 insertions(+)
diff --git a/services/core/java/com/android/server/display/DisplayPowerController.java b/services/core/java/com/android/server/display/DisplayPowerController.java
-index f8e5836..80bdf1f 100644
+index 99412c56b27..0b2f487840b 100644
--- a/services/core/java/com/android/server/display/DisplayPowerController.java
+++ b/services/core/java/com/android/server/display/DisplayPowerController.java
@@ -20,6 +20,7 @@ import android.app.ActivityManager;
@@ -27,10 +27,10 @@
import com.android.server.LocalServices;
import com.android.server.am.BatteryStatsService;
+import com.android.server.lights.LightsManager;
+ import com.android.server.policy.WindowManagerPolicy;
import android.animation.Animator;
- import android.animation.ObjectAnimator;
-@@ -129,6 +130,9 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
+@@ -141,6 +142,9 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
// Battery stats.
private final IBatteryStats mBatteryStats;
@@ -40,7 +40,7 @@
// The sensor manager.
private final SensorManager mSensorManager;
-@@ -300,6 +304,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
+@@ -374,6 +378,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
mCallbacks = callbacks;
mBatteryStats = BatteryStatsService.getService();
@@ -48,7 +48,7 @@
mSensorManager = sensorManager;
mWindowManagerPolicy = LocalServices.getService(WindowManagerPolicy.class);
mBlanker = blanker;
-@@ -678,6 +683,12 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
+@@ -769,6 +774,12 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
// Use zero brightness when screen is off.
if (state == Display.STATE_OFF) {
brightness = PowerManager.BRIGHTNESS_OFF;
@@ -60,21 +60,21 @@
+ mLights.getLight(LightsManager.LIGHT_ID_BUTTONS).setBrightness(PowerManager.BRIGHTNESS_OFF);
}
- // Configure auto-brightness.
+ // Always use the VR brightness when in the VR state.
diff --git a/services/core/java/com/android/server/power/PowerManagerService.java b/services/core/java/com/android/server/power/PowerManagerService.java
-index f84b20c..1ced53f 100644
+index 697801f7787..a9e4cda02ae 100644
--- a/services/core/java/com/android/server/power/PowerManagerService.java
+++ b/services/core/java/com/android/server/power/PowerManagerService.java
-@@ -220,6 +220,8 @@ public final class PowerManagerService extends SystemService
- private static final int HALT_MODE_REBOOT = 1;
- private static final int HALT_MODE_REBOOT_SAFE_MODE = 2;
+@@ -222,6 +222,8 @@ public final class PowerManagerService extends SystemService
+ // Persistent property for last reboot reason
+ private static final String LAST_REBOOT_PROPERTY = "persist.sys.boot.reason";
+ private static final int BUTTON_ON_DURATION = 5 * 1000;
+
- // File location for last reboot reason
- private static final String LAST_REBOOT_LOCATION = "/data/misc/reboot/last_reboot_reason";
-
-@@ -240,6 +242,7 @@ public final class PowerManagerService extends SystemService
+ private final Context mContext;
+ private final ServiceThread mHandlerThread;
+ private final PowerManagerHandler mHandler;
+@@ -242,6 +244,7 @@ public final class PowerManagerService extends SystemService
private SettingsObserver mSettingsObserver;
private DreamManagerInternal mDreamManager;
private Light mAttentionLight;
@@ -82,7 +82,7 @@
private final Object mLock = LockGuard.installNewLock(LockGuard.INDEX_POWER);
-@@ -747,6 +750,7 @@ public final class PowerManagerService extends SystemService
+@@ -770,6 +773,7 @@ public final class PowerManagerService extends SystemService
mLightsManager = getLocalService(LightsManager.class);
mAttentionLight = mLightsManager.getLight(LightsManager.LIGHT_ID_ATTENTION);
@@ -90,7 +90,7 @@
// Initialize display power management.
mDisplayManagerInternal.initPowerManagement(
-@@ -1947,6 +1951,12 @@ public final class PowerManagerService extends SystemService
+@@ -1960,6 +1964,12 @@ public final class PowerManagerService extends SystemService
nextTimeout = mLastUserActivityTime
+ screenOffTimeout - screenDimDuration;
if (now < nextTimeout) {
@@ -104,5 +104,5 @@
} else {
nextTimeout = mLastUserActivityTime + screenOffTimeout;
--
-2.7.4
+2.17.1
diff --git a/patches/platform_frameworks_base/0001-renderthread-relax-error-handling-for-wide-gamut-EGL.patch b/patches/platform_frameworks_base/0001-renderthread-relax-error-handling-for-wide-gamut-EGL.patch
deleted file mode 100644
index 62d7ab7..0000000
--- a/patches/platform_frameworks_base/0001-renderthread-relax-error-handling-for-wide-gamut-EGL.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From c4d6cce4e0e601677108be08a0c72ee58a9cb4b7 Mon Sep 17 00:00:00 2001
-From: Rob Herring <robh@kernel.org>
-Date: Wed, 29 Nov 2017 09:26:31 -0600
-Subject: [PATCH 01/16] renderthread: relax error handling for wide gamut EGL
- configs
-
-It is valid to advertise EGL_EXT_pixel_format_float, but not have a
-the requested EGL config. Instead of aborting, fallback to the default
-behavior.
-
-Change-Id: I6c602233b627dc2070364434fece57d3d0aab435
-Cc: Romain Guy <romainguy@google.com>
-Signed-off-by: Rob Herring <robh@kernel.org>
----
- libs/hwui/renderthread/EglManager.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/libs/hwui/renderthread/EglManager.cpp b/libs/hwui/renderthread/EglManager.cpp
-index 16d7736..bd4708d 100644
---- a/libs/hwui/renderthread/EglManager.cpp
-+++ b/libs/hwui/renderthread/EglManager.cpp
-@@ -223,9 +223,9 @@ void EglManager::loadConfigs() {
- numConfigs = 1;
- if (!eglChooseConfig(mEglDisplay, attribs16F, &mEglConfigWideGamut, numConfigs, &numConfigs)
- || numConfigs != 1) {
-- LOG_ALWAYS_FATAL(
-- "Device claims wide gamut support, cannot find matching config, error = %s",
-+ ALOGE("Device claims wide gamut support, cannot find matching config, error = %s",
- eglErrorString());
-+ EglExtensions.pixelFormatFloat = false;
- }
- }
- }
---
-2.7.4
-
diff --git a/patches/platform_frameworks_base/0003-power-Disable-keyboard-button-lights-while-dozing-dr.patch b/patches/platform_frameworks_base/0002-power-Disable-keyboard-button-lights-while-dozing-dr.patch
similarity index 73%
rename from patches/platform_frameworks_base/0003-power-Disable-keyboard-button-lights-while-dozing-dr.patch
rename to patches/platform_frameworks_base/0002-power-Disable-keyboard-button-lights-while-dozing-dr.patch
index 70fbc6c..af53d56 100644
--- a/patches/platform_frameworks_base/0003-power-Disable-keyboard-button-lights-while-dozing-dr.patch
+++ b/patches/platform_frameworks_base/0002-power-Disable-keyboard-button-lights-while-dozing-dr.patch
@@ -1,7 +1,7 @@
-From c7329117006efae651d4adc315cb5663fb62e2e6 Mon Sep 17 00:00:00 2001
+From 3706f2a1c164e76b4c706a528bc7ac4894fd96d3 Mon Sep 17 00:00:00 2001
From: Steve Kondik <steve@cyngn.com>
Date: Sat, 3 Jan 2015 05:13:26 -0800
-Subject: [PATCH 03/16] power: Disable keyboard/button lights while
+Subject: [PATCH 02/14] power: Disable keyboard/button lights while
dozing/dreaming
* With hardkeys and doze mode enabled, entering suspend results in
@@ -10,15 +10,15 @@
Change-Id: I7f1fc35a1573717d1ea101a07c4171d6f66d1553
---
- services/core/java/com/android/server/power/PowerManagerService.java | 2 +-
+ .../core/java/com/android/server/power/PowerManagerService.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/services/core/java/com/android/server/power/PowerManagerService.java b/services/core/java/com/android/server/power/PowerManagerService.java
-index 1ced53f..9edf6fc 100644
+index a9e4cda02ae..4d7c6d24509 100644
--- a/services/core/java/com/android/server/power/PowerManagerService.java
+++ b/services/core/java/com/android/server/power/PowerManagerService.java
-@@ -1947,7 +1947,7 @@ public final class PowerManagerService extends SystemService
- final boolean userInactiveOverride = mUserInactiveOverrideFromWindowManager;
+@@ -1960,7 +1960,7 @@ public final class PowerManagerService extends SystemService
+ final long nextProfileTimeout = getNextProfileTimeoutLocked(now);
mUserActivitySummary = 0;
- if (mLastUserActivityTime >= mLastWakeTime) {
@@ -27,5 +27,5 @@
+ screenOffTimeout - screenDimDuration;
if (now < nextTimeout) {
--
-2.7.4
+2.17.1
diff --git a/patches/platform_frameworks_base/0004-Fix-backlight-control-on-Galaxy-S9.patch b/patches/platform_frameworks_base/0003-Fix-backlight-control-on-Galaxy-S9.patch
similarity index 83%
rename from patches/platform_frameworks_base/0004-Fix-backlight-control-on-Galaxy-S9.patch
rename to patches/platform_frameworks_base/0003-Fix-backlight-control-on-Galaxy-S9.patch
index 513decf..56683bc 100644
--- a/patches/platform_frameworks_base/0004-Fix-backlight-control-on-Galaxy-S9.patch
+++ b/patches/platform_frameworks_base/0003-Fix-backlight-control-on-Galaxy-S9.patch
@@ -1,14 +1,14 @@
-From a82315411eca9c1bb28216eb537f5a63b8a5fb94 Mon Sep 17 00:00:00 2001
+From 9ae6ae97637638189f9a8c632f07f0272ec22c73 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Sat, 24 Mar 2018 08:01:48 +0100
-Subject: [PATCH 04/16] Fix backlight control on Galaxy S9(+)
+Subject: [PATCH 03/14] Fix backlight control on Galaxy S9(+)
---
- services/core/java/com/android/server/lights/LightsService.java | 7 +++++++
+ .../core/java/com/android/server/lights/LightsService.java | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/services/core/java/com/android/server/lights/LightsService.java b/services/core/java/com/android/server/lights/LightsService.java
-index a94ed60..762b0ae 100644
+index a94ed608b9c..762b0ae4037 100644
--- a/services/core/java/com/android/server/lights/LightsService.java
+++ b/services/core/java/com/android/server/lights/LightsService.java
@@ -21,6 +21,7 @@ import android.app.ActivityManager;
@@ -33,5 +33,5 @@
color = 0xff000000 | (color << 16) | (color << 8) | color;
setLightLocked(color, LIGHT_FLASH_NONE, 0, 0, brightnessMode);
--
-2.7.4
+2.17.1
diff --git a/patches/platform_frameworks_base/0005-Relax-requirement-for-visible-flag-to-sdcards.patch b/patches/platform_frameworks_base/0004-Relax-requirement-for-visible-flag-to-sdcards.patch
similarity index 77%
rename from patches/platform_frameworks_base/0005-Relax-requirement-for-visible-flag-to-sdcards.patch
rename to patches/platform_frameworks_base/0004-Relax-requirement-for-visible-flag-to-sdcards.patch
index 3b124d3..eabb351 100644
--- a/patches/platform_frameworks_base/0005-Relax-requirement-for-visible-flag-to-sdcards.patch
+++ b/patches/platform_frameworks_base/0004-Relax-requirement-for-visible-flag-to-sdcards.patch
@@ -1,7 +1,7 @@
-From d807609094b6da867f2cb2672a6c36fb6bddaf05 Mon Sep 17 00:00:00 2001
+From f42553122ec0246adbe1685e3667bc53731cd9fb Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Tue, 28 Nov 2017 18:28:04 +0100
-Subject: [PATCH 05/16] Relax requirement for visible flag to sdcards
+Subject: [PATCH 04/14] Relax requirement for visible flag to sdcards
The vast majority of sdcard readers are stable enough to be declared by
the API. (I see no counter-example)
@@ -9,14 +9,14 @@
Change-Id: Ia616671c03562d1eadaff5531a5c708a62d7ad3a
---
- services/core/java/com/android/server/StorageManagerService.java | 3 ++-
+ .../core/java/com/android/server/StorageManagerService.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/services/core/java/com/android/server/StorageManagerService.java b/services/core/java/com/android/server/StorageManagerService.java
-index 1ca0112..4014cab 100644
+index 183be9b9875..e8f2ad16a55 100644
--- a/services/core/java/com/android/server/StorageManagerService.java
+++ b/services/core/java/com/android/server/StorageManagerService.java
-@@ -1316,7 +1316,8 @@ class StorageManagerService extends IStorageManager.Stub
+@@ -1178,7 +1178,8 @@ class StorageManagerService extends IStorageManager.Stub
// Adoptable public disks are visible to apps, since they meet
// public API requirement of being in a stable location.
@@ -27,5 +27,5 @@
}
--
-2.7.4
+2.17.1
diff --git a/patches/platform_frameworks_base/0008-Don-t-crash-if-there-is-IR-HAL-is-not-declared.patch b/patches/platform_frameworks_base/0005-Don-t-crash-if-there-is-IR-HAL-is-not-declared.patch
similarity index 83%
rename from patches/platform_frameworks_base/0008-Don-t-crash-if-there-is-IR-HAL-is-not-declared.patch
rename to patches/platform_frameworks_base/0005-Don-t-crash-if-there-is-IR-HAL-is-not-declared.patch
index 7e0fbe7..fb42d9e 100644
--- a/patches/platform_frameworks_base/0008-Don-t-crash-if-there-is-IR-HAL-is-not-declared.patch
+++ b/patches/platform_frameworks_base/0005-Don-t-crash-if-there-is-IR-HAL-is-not-declared.patch
@@ -1,14 +1,14 @@
-From b099c00a7e70e730a4d1c7227e911f8f09ffd5f3 Mon Sep 17 00:00:00 2001
+From e59a2330fe4055865eb28983a4d4a994a6298368 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Thu, 17 May 2018 20:28:35 +0200
-Subject: [PATCH 08/16] Don't crash if there is IR HAL is not declared
+Subject: [PATCH 05/14] Don't crash if there is IR HAL is not declared
---
services/core/java/com/android/server/ConsumerIrService.java | 2 --
1 file changed, 2 deletions(-)
diff --git a/services/core/java/com/android/server/ConsumerIrService.java b/services/core/java/com/android/server/ConsumerIrService.java
-index 2ed6c77..c574a03 100644
+index 2ed6c77baa0..c574a03c9a3 100644
--- a/services/core/java/com/android/server/ConsumerIrService.java
+++ b/services/core/java/com/android/server/ConsumerIrService.java
@@ -50,8 +50,6 @@ public class ConsumerIrService extends IConsumerIrService.Stub {
@@ -21,5 +21,5 @@
}
--
-2.7.4
+2.17.1
diff --git a/patches/platform_frameworks_base/0006-Also-scan-product-overlay-for-RRO.patch b/patches/platform_frameworks_base/0006-Also-scan-product-overlay-for-RRO.patch
deleted file mode 100644
index c2bb075..0000000
--- a/patches/platform_frameworks_base/0006-Also-scan-product-overlay-for-RRO.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 1fef41d82a1e7a2bbafebcf519a60c888ffd3c4b Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <pierre-hugues.husson@softathome.com>
-Date: Tue, 24 Apr 2018 18:08:59 +0200
-Subject: [PATCH 06/16] Also scan /product/overlay for RRO
-
----
- core/jni/android_util_AssetManager.cpp | 6 +++++-
- core/jni/fd_utils.cpp | 3 ++-
- 2 files changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/core/jni/android_util_AssetManager.cpp b/core/jni/android_util_AssetManager.cpp
-index b137da3..30d8abe 100644
---- a/core/jni/android_util_AssetManager.cpp
-+++ b/core/jni/android_util_AssetManager.cpp
-@@ -164,7 +164,7 @@ static void verifySystemIdmaps()
- }
-
- // Generic idmap parameters
-- const char* argv[8];
-+ const char* argv[9];
- int argc = 0;
- struct stat st;
-
-@@ -189,6 +189,10 @@ static void verifySystemIdmaps()
- argv[argc++] = AssetManager::OVERLAY_DIR;
- }
-
-+ if (stat("/product/overlay/", &st) == 0) {
-+ argv[argc++] = "/product/overlay";
-+ }
-+
- // Finally, invoke idmap (if any overlay directory exists)
- if (argc > 5) {
- execv(AssetManager::IDMAP_BIN, (char* const*)argv);
-diff --git a/core/jni/fd_utils.cpp b/core/jni/fd_utils.cpp
-index 956b724..496b140 100644
---- a/core/jni/fd_utils.cpp
-+++ b/core/jni/fd_utils.cpp
-@@ -89,7 +89,8 @@ bool FileDescriptorWhitelist::IsAllowed(const std::string& path) const {
-
- if ((android::base::StartsWith(path, kOverlayDir)
- || android::base::StartsWith(path, kOverlaySubdir)
-- || android::base::StartsWith(path, kVendorOverlayDir))
-+ || android::base::StartsWith(path, kVendorOverlayDir)
-+ || android::base::StartsWith(path, "/product/overlay"))
- && android::base::EndsWith(path, kApkSuffix)
- && path.find("/../") == std::string::npos) {
- return true;
---
-2.7.4
-
diff --git a/patches/platform_frameworks_base/0010-S9-brightness-override-only-for-screen.patch b/patches/platform_frameworks_base/0006-S9-brightness-override-only-for-screen.patch
similarity index 84%
rename from patches/platform_frameworks_base/0010-S9-brightness-override-only-for-screen.patch
rename to patches/platform_frameworks_base/0006-S9-brightness-override-only-for-screen.patch
index 8cc2205..0a439f3 100644
--- a/patches/platform_frameworks_base/0010-S9-brightness-override-only-for-screen.patch
+++ b/patches/platform_frameworks_base/0006-S9-brightness-override-only-for-screen.patch
@@ -1,14 +1,14 @@
-From 6ef0f1fc726df642fef81ccd15edde6e9daaed53 Mon Sep 17 00:00:00 2001
+From fb7d17fad6ee79602330c669d7ce835561be0fb1 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <pierre-hugues.husson@softathome.com>
Date: Thu, 7 Jun 2018 13:36:51 +0200
-Subject: [PATCH 10/16] S9 brightness override only for screen
+Subject: [PATCH 06/14] S9 brightness override only for screen
---
- .../core/java/com/android/server/lights/LightsService.java | 12 +++++++-----
+ .../com/android/server/lights/LightsService.java | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/services/core/java/com/android/server/lights/LightsService.java b/services/core/java/com/android/server/lights/LightsService.java
-index 762b0ae..eb25943 100644
+index 762b0ae4037..eb25943fa6b 100644
--- a/services/core/java/com/android/server/lights/LightsService.java
+++ b/services/core/java/com/android/server/lights/LightsService.java
@@ -53,11 +53,13 @@ public class LightsService extends SystemService {
@@ -31,5 +31,5 @@
int color = brightness & 0x000000ff;
color = 0xff000000 | (color << 16) | (color << 8) | color;
--
-2.7.4
+2.17.1
diff --git a/patches/platform_frameworks_base/0007-Also-scan-system-overlay.patch b/patches/platform_frameworks_base/0007-Also-scan-system-overlay.patch
deleted file mode 100644
index ec64a33..0000000
--- a/patches/platform_frameworks_base/0007-Also-scan-system-overlay.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From e89aed22785fc3ce5aa0bd75c6410003dbc55245 Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Tue, 1 May 2018 17:47:36 +0200
-Subject: [PATCH 07/16] Also scan /system/overlay
-
----
- core/jni/android_util_AssetManager.cpp | 6 +++++-
- core/jni/fd_utils.cpp | 3 ++-
- 2 files changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/core/jni/android_util_AssetManager.cpp b/core/jni/android_util_AssetManager.cpp
-index 30d8abe..9ec1a75 100644
---- a/core/jni/android_util_AssetManager.cpp
-+++ b/core/jni/android_util_AssetManager.cpp
-@@ -164,7 +164,7 @@ static void verifySystemIdmaps()
- }
-
- // Generic idmap parameters
-- const char* argv[9];
-+ const char* argv[10];
- int argc = 0;
- struct stat st;
-
-@@ -193,6 +193,10 @@ static void verifySystemIdmaps()
- argv[argc++] = "/product/overlay";
- }
-
-+ if (stat("/system/overlay/", &st) == 0) {
-+ argv[argc++] = "/system/overlay";
-+ }
-+
- // Finally, invoke idmap (if any overlay directory exists)
- if (argc > 5) {
- execv(AssetManager::IDMAP_BIN, (char* const*)argv);
-diff --git a/core/jni/fd_utils.cpp b/core/jni/fd_utils.cpp
-index 496b140..6ba3798 100644
---- a/core/jni/fd_utils.cpp
-+++ b/core/jni/fd_utils.cpp
-@@ -90,7 +90,8 @@ bool FileDescriptorWhitelist::IsAllowed(const std::string& path) const {
- if ((android::base::StartsWith(path, kOverlayDir)
- || android::base::StartsWith(path, kOverlaySubdir)
- || android::base::StartsWith(path, kVendorOverlayDir)
-- || android::base::StartsWith(path, "/product/overlay"))
-+ || android::base::StartsWith(path, "/product/overlay")
-+ || android::base::StartsWith(path, "/system/overlay"))
- && android::base::EndsWith(path, kApkSuffix)
- && path.find("/../") == std::string::npos) {
- return true;
---
-2.7.4
-
diff --git a/patches/platform_frameworks_base/0011-WIP-Fix-OP6-brightness.patch b/patches/platform_frameworks_base/0007-WIP-Fix-OP6-brightness.patch
similarity index 83%
rename from patches/platform_frameworks_base/0011-WIP-Fix-OP6-brightness.patch
rename to patches/platform_frameworks_base/0007-WIP-Fix-OP6-brightness.patch
index be2c326..7fb90ae 100644
--- a/patches/platform_frameworks_base/0011-WIP-Fix-OP6-brightness.patch
+++ b/patches/platform_frameworks_base/0007-WIP-Fix-OP6-brightness.patch
@@ -1,21 +1,21 @@
-From d68bb6edb78ecc043456474e6f57725a319f0a81 Mon Sep 17 00:00:00 2001
+From 6f5006b0114bdca09e64a82d2b02729f1f34655d Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <pierre-hugues.husson@softathome.com>
Date: Thu, 7 Jun 2018 13:42:02 +0200
-Subject: [PATCH 11/16] [WIP] Fix OP6 brightness
+Subject: [PATCH 07/14] [WIP] Fix OP6 brightness
---
- .../core/java/com/android/server/lights/LightsService.java | 12 ++++++++++++
+ .../com/android/server/lights/LightsService.java | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/services/core/java/com/android/server/lights/LightsService.java b/services/core/java/com/android/server/lights/LightsService.java
-index eb25943..a77af44 100644
+index eb25943fa6b..a77af445ba6 100644
--- a/services/core/java/com/android/server/lights/LightsService.java
+++ b/services/core/java/com/android/server/lights/LightsService.java
@@ -59,6 +59,18 @@ public class LightsService extends SystemService {
setLightLocked(brightness*100, LIGHT_FLASH_HARDWARE, 0, 0, brightnessMode);
return;
}
-+ /*
++
+ boolean qcomExtendBrightness = SystemProperties.getBoolean("persist.extend.brightness", false);
+ int scale = SystemProperties.getInt("persist.display.max_brightness", 1023);
+ if(fp.contains("OnePlus6")) {
@@ -26,10 +26,10 @@
+ if(qcomExtendBrightness) {
+ setLightLocked(brightness * scale / 255, LIGHT_FLASH_NONE, 0, 0, brightnessMode);
+ return;
-+ } */
++ }
}
int color = brightness & 0x000000ff;
--
-2.7.4
+2.17.1
diff --git a/patches/platform_frameworks_base/0012-Try-to-make-brightness-more-generic-using-property-s.patch b/patches/platform_frameworks_base/0008-Try-to-make-brightness-more-generic-using-property-s.patch
similarity index 83%
rename from patches/platform_frameworks_base/0012-Try-to-make-brightness-more-generic-using-property-s.patch
rename to patches/platform_frameworks_base/0008-Try-to-make-brightness-more-generic-using-property-s.patch
index d48a466..ab541d4 100644
--- a/patches/platform_frameworks_base/0012-Try-to-make-brightness-more-generic-using-property-s.patch
+++ b/patches/platform_frameworks_base/0008-Try-to-make-brightness-more-generic-using-property-s.patch
@@ -1,15 +1,15 @@
-From 33bc4de58fe68c44a270adbaeadd68e7756e98a6 Mon Sep 17 00:00:00 2001
+From 51ece7cfa0dbda604386ede0c5a360f06346f755 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Sun, 10 Jun 2018 22:54:55 +0200
-Subject: [PATCH 12/16] Try to make brightness more generic using property set
+Subject: [PATCH 08/14] Try to make brightness more generic using property set
by rw-system
---
- services/core/java/com/android/server/lights/LightsService.java | 6 ++++--
+ .../core/java/com/android/server/lights/LightsService.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/services/core/java/com/android/server/lights/LightsService.java b/services/core/java/com/android/server/lights/LightsService.java
-index a77af44..4dc44de 100644
+index a77af445ba6..4dc44de37cd 100644
--- a/services/core/java/com/android/server/lights/LightsService.java
+++ b/services/core/java/com/android/server/lights/LightsService.java
@@ -62,9 +62,11 @@ public class LightsService extends SystemService {
@@ -27,5 +27,5 @@
if(qcomExtendBrightness) {
--
-2.7.4
+2.17.1
diff --git a/patches/platform_frameworks_base/0009-Fix-62.patch b/patches/platform_frameworks_base/0009-Fix-62.patch
deleted file mode 100644
index 2cbe176..0000000
--- a/patches/platform_frameworks_base/0009-Fix-62.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 90b1f32b2e4bbc22ee9dbbf586a804639fbe90f4 Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Wed, 30 May 2018 14:05:30 +0200
-Subject: [PATCH 09/16] Fix(?) #62
-
----
- .../SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java
-index cd23c97..7a0e1cb 100644
---- a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java
-+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java
-@@ -837,7 +837,10 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener {
-
- @Override
- public void onAuthenticationError(int errMsgId, CharSequence errString) {
-- handleFingerprintError(errMsgId, errString.toString());
-+ if(errString != null)
-+ handleFingerprintError(errMsgId, errString.toString());
-+ else
-+ handleFingerprintError(errMsgId, "unknown error");
- }
-
- @Override
---
-2.7.4
-
diff --git a/patches/platform_frameworks_base/0013-property-matching-RROs-allow-to-prefix-the-value-wit.patch b/patches/platform_frameworks_base/0009-property-matching-RROs-allow-to-prefix-the-value-wit.patch
similarity index 80%
rename from patches/platform_frameworks_base/0013-property-matching-RROs-allow-to-prefix-the-value-wit.patch
rename to patches/platform_frameworks_base/0009-property-matching-RROs-allow-to-prefix-the-value-wit.patch
index 3621435..d249c7f 100644
--- a/patches/platform_frameworks_base/0013-property-matching-RROs-allow-to-prefix-the-value-wit.patch
+++ b/patches/platform_frameworks_base/0009-property-matching-RROs-allow-to-prefix-the-value-wit.patch
@@ -1,7 +1,7 @@
-From 02f3116e5a71bef5643bc9a6e6e7cdc9a0d1cf06 Mon Sep 17 00:00:00 2001
+From 35348fb993ba80c33ec9ffa2dcc1f5a4747cce87 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Tue, 12 Jun 2018 22:55:32 +0200
-Subject: [PATCH 13/16] property-matching RROs: allow to prefix the value with
+Subject: [PATCH 09/14] property-matching RROs: allow to prefix the value with
+ to do glob match instead of exact match
---
@@ -9,7 +9,7 @@
1 file changed, 5 insertions(+)
diff --git a/cmds/idmap/scan.cpp b/cmds/idmap/scan.cpp
-index d69dd79..2be6d23 100644
+index d69dd79555a..2be6d23ac78 100644
--- a/cmds/idmap/scan.cpp
+++ b/cmds/idmap/scan.cpp
@@ -1,5 +1,6 @@
@@ -31,5 +31,5 @@
}
--
-2.7.4
+2.17.1
diff --git a/patches/platform_frameworks_base/0014-Fix-typo-on-fnmatch-return-value-check.patch b/patches/platform_frameworks_base/0010-Fix-typo-on-fnmatch-return-value-check.patch
similarity index 76%
rename from patches/platform_frameworks_base/0014-Fix-typo-on-fnmatch-return-value-check.patch
rename to patches/platform_frameworks_base/0010-Fix-typo-on-fnmatch-return-value-check.patch
index cdc860d..0689689 100644
--- a/patches/platform_frameworks_base/0014-Fix-typo-on-fnmatch-return-value-check.patch
+++ b/patches/platform_frameworks_base/0010-Fix-typo-on-fnmatch-return-value-check.patch
@@ -1,14 +1,14 @@
-From b8fd5db5611395bef9b7338d70d1279317849334 Mon Sep 17 00:00:00 2001
+From 471462f5c7428037f5bf0670c2d96cba15551dba Mon Sep 17 00:00:00 2001
From: Song Fuchang <song.fc@gmail.com>
Date: Sun, 17 Jun 2018 22:39:37 +0800
-Subject: [PATCH 14/16] Fix typo on fnmatch return value check
+Subject: [PATCH 10/14] Fix typo on fnmatch return value check
---
cmds/idmap/scan.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cmds/idmap/scan.cpp b/cmds/idmap/scan.cpp
-index 2be6d23..0acff23 100644
+index 2be6d23ac78..0acff23d031 100644
--- a/cmds/idmap/scan.cpp
+++ b/cmds/idmap/scan.cpp
@@ -94,7 +94,7 @@ namespace {
@@ -21,5 +21,5 @@
return (strcmp(propBuf, val) == 0);
--
-2.7.4
+2.17.1
diff --git a/patches/platform_frameworks_base/0015-Add-Qualcomm-starlte.patch b/patches/platform_frameworks_base/0011-Add-Qualcomm-starlte.patch
similarity index 82%
rename from patches/platform_frameworks_base/0015-Add-Qualcomm-starlte.patch
rename to patches/platform_frameworks_base/0011-Add-Qualcomm-starlte.patch
index 61adacd..7bd8e17 100644
--- a/patches/platform_frameworks_base/0015-Add-Qualcomm-starlte.patch
+++ b/patches/platform_frameworks_base/0011-Add-Qualcomm-starlte.patch
@@ -1,14 +1,14 @@
-From 983bd7a99b11e25b620fe37622f1f3a7f81dc7bd Mon Sep 17 00:00:00 2001
+From b3de3ae8a9b05017a0bf8329653075bf3b5960ea Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Mon, 25 Jun 2018 22:43:32 +0200
-Subject: [PATCH 15/16] Add Qualcomm starlte
+Subject: [PATCH 11/14] Add Qualcomm starlte
---
- services/core/java/com/android/server/lights/LightsService.java | 4 +++-
+ .../core/java/com/android/server/lights/LightsService.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/services/core/java/com/android/server/lights/LightsService.java b/services/core/java/com/android/server/lights/LightsService.java
-index 4dc44de..2886f29 100644
+index 4dc44de37cd..2886f2900d9 100644
--- a/services/core/java/com/android/server/lights/LightsService.java
+++ b/services/core/java/com/android/server/lights/LightsService.java
@@ -55,7 +55,9 @@ public class LightsService extends SystemService {
@@ -23,5 +23,5 @@
return;
}
--
-2.7.4
+2.17.1
diff --git a/patches/platform_frameworks_base/0016-Galaxy-S9-remaining-of-HAL-onEnroll-is-actually-a-pe.patch b/patches/platform_frameworks_base/0012-Galaxy-S9-remaining-of-HAL-onEnroll-is-actually-a-pe.patch
similarity index 77%
rename from patches/platform_frameworks_base/0016-Galaxy-S9-remaining-of-HAL-onEnroll-is-actually-a-pe.patch
rename to patches/platform_frameworks_base/0012-Galaxy-S9-remaining-of-HAL-onEnroll-is-actually-a-pe.patch
index 50564d2..affb9ba 100644
--- a/patches/platform_frameworks_base/0016-Galaxy-S9-remaining-of-HAL-onEnroll-is-actually-a-pe.patch
+++ b/patches/platform_frameworks_base/0012-Galaxy-S9-remaining-of-HAL-onEnroll-is-actually-a-pe.patch
@@ -1,18 +1,18 @@
-From 352a0b282645b142c4a57fd165e35b39602953b9 Mon Sep 17 00:00:00 2001
+From 4e3b41d78574dbb3398c3464e68be708cbb9f553 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Mon, 2 Jul 2018 23:36:39 +0200
-Subject: [PATCH 16/16] [Galaxy S9] "remaining" of HAL onEnroll is actually a
+Subject: [PATCH 12/14] [Galaxy S9] "remaining" of HAL onEnroll is actually a
percent of progress
---
- .../java/com/android/server/fingerprint/FingerprintService.java | 6 +++++-
+ .../com/android/server/fingerprint/FingerprintService.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/services/core/java/com/android/server/fingerprint/FingerprintService.java b/services/core/java/com/android/server/fingerprint/FingerprintService.java
-index b1c165e..3cfa367 100644
+index 06329e571b4..6f09433c002 100644
--- a/services/core/java/com/android/server/fingerprint/FingerprintService.java
+++ b/services/core/java/com/android/server/fingerprint/FingerprintService.java
-@@ -955,7 +955,11 @@ public class FingerprintService extends SystemService implements IHwBinder.Death
+@@ -1046,7 +1046,11 @@ public class FingerprintService extends SystemService implements IHwBinder.Death
mHandler.post(new Runnable() {
@Override
public void run() {
@@ -26,5 +26,5 @@
});
}
--
-2.7.4
+2.17.1
diff --git a/patches/platform_frameworks_base/0013-Show-APN-Settings-for-CDMA-carriers.patch b/patches/platform_frameworks_base/0013-Show-APN-Settings-for-CDMA-carriers.patch
new file mode 100644
index 0000000..1431098
--- /dev/null
+++ b/patches/platform_frameworks_base/0013-Show-APN-Settings-for-CDMA-carriers.patch
@@ -0,0 +1,25 @@
+From 053b2324df01b1acfd36216782e01f1890dfceab Mon Sep 17 00:00:00 2001
+From: Pierre-Hugues Husson <phh@phh.me>
+Date: Mon, 6 Aug 2018 12:49:00 +0200
+Subject: [PATCH 13/14] Show APN Settings for CDMA carriers
+
+---
+ telephony/java/android/telephony/CarrierConfigManager.java | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java
+index f66164c302c..0cf93a18ca5 100644
+--- a/telephony/java/android/telephony/CarrierConfigManager.java
++++ b/telephony/java/android/telephony/CarrierConfigManager.java
+@@ -2019,7 +2019,7 @@ public class CarrierConfigManager {
+ sDefaults.putBoolean(KEY_MDN_IS_ADDITIONAL_VOICEMAIL_NUMBER_BOOL, false);
+ sDefaults.putBoolean(KEY_OPERATOR_SELECTION_EXPAND_BOOL, true);
+ sDefaults.putBoolean(KEY_PREFER_2G_BOOL, true);
+- sDefaults.putBoolean(KEY_SHOW_APN_SETTING_CDMA_BOOL, false);
++ sDefaults.putBoolean(KEY_SHOW_APN_SETTING_CDMA_BOOL, true);
+ sDefaults.putBoolean(KEY_SHOW_CDMA_CHOICES_BOOL, false);
+ sDefaults.putBoolean(KEY_SMS_REQUIRES_DESTINATION_NUMBER_CONVERSION_BOOL, false);
+ sDefaults.putBoolean(KEY_SHOW_ONSCREEN_DIAL_BUTTON_BOOL, true);
+--
+2.17.1
+
diff --git a/patches/platform_frameworks_base/0014-Change-SignalStrentgh-to-change-behaviour-based-on-p.patch b/patches/platform_frameworks_base/0014-Change-SignalStrentgh-to-change-behaviour-based-on-p.patch
new file mode 100644
index 0000000..5d20653
--- /dev/null
+++ b/patches/platform_frameworks_base/0014-Change-SignalStrentgh-to-change-behaviour-based-on-p.patch
@@ -0,0 +1,78 @@
+From ff10685c75c5aa837ce70cb572ec5180a7f496d2 Mon Sep 17 00:00:00 2001
+From: Pierre-Hugues Husson <phh@phh.me>
+Date: Mon, 6 Aug 2018 20:01:44 +0200
+Subject: [PATCH 14/14] Change SignalStrentgh to change behaviour based on
+ property
+
+Change-Id: I9e8bec3dd41ecc983e007f6d00157170ac0a3e28
+---
+ .../android/telephony/SignalStrength.java | 39 +++++++++++++------
+ 1 file changed, 27 insertions(+), 12 deletions(-)
+
+diff --git a/telephony/java/android/telephony/SignalStrength.java b/telephony/java/android/telephony/SignalStrength.java
+index 4e5639683a7..ff906d330d4 100644
+--- a/telephony/java/android/telephony/SignalStrength.java
++++ b/telephony/java/android/telephony/SignalStrength.java
+@@ -854,6 +854,7 @@ public class SignalStrength implements Parcelable {
+ * RSRQ = quality of signal dB = Number of Resource blocks*RSRP/RSSI
+ * SNR = gain = signal/noise ratio = -10log P1/P2 dB
+ */
++ String method = android.os.SystemProperties.get("persist.sys.signal.level", "default");
+ int rssiIconLevel = SIGNAL_STRENGTH_NONE_OR_UNKNOWN, rsrpIconLevel = -1, snrIconLevel = -1;
+
+ if (mLteRsrp > MAX_LTE_RSRP || mLteRsrp < MIN_LTE_RSRP) {
+@@ -897,6 +898,32 @@ public class SignalStrength implements Parcelable {
+ + rsrpIconLevel + " snrIconLevel:" + snrIconLevel
+ + " lteRsrpBoost:" + mLteRsrpBoost);
+
++ /* Valid values are (0-63, 99) as defined in TS 36.331 */
++ // TODO the range here is probably supposed to be (0..31, 99). It's unclear if anyone relies
++ // on the current incorrect range check, so this will be fixed in a future release with more
++ // soak time
++ if (mLteSignalStrength > 63) rssiIconLevel = SIGNAL_STRENGTH_NONE_OR_UNKNOWN;
++ else if (mLteSignalStrength >= 12) rssiIconLevel = SIGNAL_STRENGTH_GREAT;
++ else if (mLteSignalStrength >= 8) rssiIconLevel = SIGNAL_STRENGTH_GOOD;
++ else if (mLteSignalStrength >= 5) rssiIconLevel = SIGNAL_STRENGTH_MODERATE;
++ else if (mLteSignalStrength >= 0) rssiIconLevel = SIGNAL_STRENGTH_POOR;
++
++ if (DBG) log("getLTELevel - rssi:" + mLteSignalStrength + " rssiIconLevel:"
++ + rssiIconLevel);
++
++ if("rsrp".equals(method)) {
++ if(rsrpIconLevel == -1) rsrpIconLevel = SIGNAL_STRENGTH_NONE_OR_UNKNOWN;
++ return rsrpIconLevel;
++ }
++ if("rssnr".equals(method)) {
++ if(snrIconLevel == -1) snrIconLevel = SIGNAL_STRENGTH_NONE_OR_UNKNOWN;
++ return snrIconLevel;
++ }
++ if("rssi".equals(method)) {
++ if(rssiIconLevel == -1) rssiIconLevel = SIGNAL_STRENGTH_NONE_OR_UNKNOWN;
++ return rssiIconLevel;
++ }
++
+ /* Choose a measurement type to use for notification */
+ if (snrIconLevel != -1 && rsrpIconLevel != -1) {
+ /*
+@@ -911,18 +938,6 @@ public class SignalStrength implements Parcelable {
+
+ if (rsrpIconLevel != -1) return rsrpIconLevel;
+
+- /* Valid values are (0-63, 99) as defined in TS 36.331 */
+- // TODO the range here is probably supposed to be (0..31, 99). It's unclear if anyone relies
+- // on the current incorrect range check, so this will be fixed in a future release with more
+- // soak time
+- if (mLteSignalStrength > 63) rssiIconLevel = SIGNAL_STRENGTH_NONE_OR_UNKNOWN;
+- else if (mLteSignalStrength >= 12) rssiIconLevel = SIGNAL_STRENGTH_GREAT;
+- else if (mLteSignalStrength >= 8) rssiIconLevel = SIGNAL_STRENGTH_GOOD;
+- else if (mLteSignalStrength >= 5) rssiIconLevel = SIGNAL_STRENGTH_MODERATE;
+- else if (mLteSignalStrength >= 0) rssiIconLevel = SIGNAL_STRENGTH_POOR;
+-
+- if (DBG) log("getLteLevel - rssi:" + mLteSignalStrength + " rssiIconLevel:"
+- + rssiIconLevel);
+ return rssiIconLevel;
+
+ }
+--
+2.17.1
+