remove redundant patches
Change-Id: I96d2801e9e2192fc381397d2d233a76cefd17cac
diff --git a/patches/platform_frameworks_base/0001-Reintroduce-button-backlight-and-respective-inactivi.patch b/patches/platform_frameworks_base/0001-Reintroduce-button-backlight-and-respective-inactivi.patch
deleted file mode 100644
index a4d1b92..0000000
--- a/patches/platform_frameworks_base/0001-Reintroduce-button-backlight-and-respective-inactivi.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-From 035ecde36847f70c7499d576afe1dfa9e130ec8f Mon Sep 17 00:00:00 2001
-From: Ricardo Cerqueira <cyanogenmod@cerqueira.org>
-Date: Fri, 23 Nov 2012 14:23:16 +0000
-Subject: [PATCH 01/14] Reintroduce button-backlight (and respective inactivity
- timeout)
-
-The power manager rewrite from Change I1d7a52e98f0449f76d70bf421f6a7f245957d1d7
-completely removed support for control of the button backlights, which makes
-all capacitive buttons out there stay dark. The commit message in that change
-mentions it hasn't been implemented _yet_, so this fix should be temporary
-until upstream does their own implementation
-
-[RC: Updated to 5.0]
-
-Change-Id: I6094c446e0b8c23f57d30652a3cbd35dee5e821a
----
- .../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 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;
- import com.android.internal.app.IBatteryStats;
- 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;
-@@ -141,6 +142,9 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
- // Battery stats.
- private final IBatteryStats mBatteryStats;
-
-+ // The lights service.
-+ private final LightsManager mLights;
-+
- // The sensor manager.
- private final SensorManager mSensorManager;
-
-@@ -374,6 +378,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
- mCallbacks = callbacks;
-
- mBatteryStats = BatteryStatsService.getService();
-+ mLights = LocalServices.getService(LightsManager.class);
- mSensorManager = sensorManager;
- mWindowManagerPolicy = LocalServices.getService(WindowManagerPolicy.class);
- mBlanker = blanker;
-@@ -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;
-+ mLights.getLight(LightsManager.LIGHT_ID_BUTTONS).setBrightness(brightness);
-+ }
-+
-+ // Disable button lights when dozing
-+ if (state == Display.STATE_DOZE || state == Display.STATE_DOZE_SUSPEND) {
-+ mLights.getLight(LightsManager.LIGHT_ID_BUTTONS).setBrightness(PowerManager.BRIGHTNESS_OFF);
- }
-
- // 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 697801f7787..a9e4cda02ae 100644
---- a/services/core/java/com/android/server/power/PowerManagerService.java
-+++ b/services/core/java/com/android/server/power/PowerManagerService.java
-@@ -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;
-+
- 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;
-+ private Light mButtonsLight;
-
- private final Object mLock = LockGuard.installNewLock(LockGuard.INDEX_POWER);
-
-@@ -770,6 +773,7 @@ public final class PowerManagerService extends SystemService
-
- mLightsManager = getLocalService(LightsManager.class);
- mAttentionLight = mLightsManager.getLight(LightsManager.LIGHT_ID_ATTENTION);
-+ mButtonsLight = mLightsManager.getLight(LightsManager.LIGHT_ID_BUTTONS);
-
- // Initialize display power management.
- mDisplayManagerInternal.initPowerManagement(
-@@ -1960,6 +1964,12 @@ public final class PowerManagerService extends SystemService
- nextTimeout = mLastUserActivityTime
- + screenOffTimeout - screenDimDuration;
- if (now < nextTimeout) {
-+ if (now > mLastUserActivityTime + BUTTON_ON_DURATION) {
-+ mButtonsLight.setBrightness(0);
-+ } else {
-+ mButtonsLight.setBrightness(mDisplayPowerRequest.screenBrightness);
-+ nextTimeout = now + BUTTON_ON_DURATION;
-+ }
- mUserActivitySummary = USER_ACTIVITY_SCREEN_BRIGHT;
- } else {
- nextTimeout = mLastUserActivityTime + screenOffTimeout;
---
-2.17.1
-
diff --git a/patches/platform_frameworks_base/0002-power-Disable-keyboard-button-lights-while-dozing-dr.patch b/patches/platform_frameworks_base/0002-power-Disable-keyboard-button-lights-while-dozing-dr.patch
deleted file mode 100644
index 9f13fa2..0000000
--- a/patches/platform_frameworks_base/0002-power-Disable-keyboard-button-lights-while-dozing-dr.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 8478f462f9f11b38a10fd24c265a25504f67f8ba Mon Sep 17 00:00:00 2001
-From: Steve Kondik <steve@cyngn.com>
-Date: Sat, 3 Jan 2015 05:13:26 -0800
-Subject: [PATCH 02/14] power: Disable keyboard/button lights while
- dozing/dreaming
-
- * With hardkeys and doze mode enabled, entering suspend results in
- an epic battle over the lights. It's a bad situation. Disable
- them when we're sleepy.
-
-Change-Id: I7f1fc35a1573717d1ea101a07c4171d6f66d1553
----
- .../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 a9e4cda02ae..4d7c6d24509 100644
---- a/services/core/java/com/android/server/power/PowerManagerService.java
-+++ b/services/core/java/com/android/server/power/PowerManagerService.java
-@@ -1960,7 +1960,7 @@ public final class PowerManagerService extends SystemService
- final long nextProfileTimeout = getNextProfileTimeoutLocked(now);
-
- mUserActivitySummary = 0;
-- if (mLastUserActivityTime >= mLastWakeTime) {
-+ if (mWakefulness == WAKEFULNESS_AWAKE && mLastUserActivityTime >= mLastWakeTime) {
- nextTimeout = mLastUserActivityTime
- + screenOffTimeout - screenDimDuration;
- if (now < nextTimeout) {
---
-2.17.1
-
diff --git a/patches/platform_frameworks_base/0003-Fix-backlight-control-on-Galaxy-S9.patch b/patches/platform_frameworks_base/0003-Fix-backlight-control-on-Galaxy-S9.patch
deleted file mode 100644
index 042b82f..0000000
--- a/patches/platform_frameworks_base/0003-Fix-backlight-control-on-Galaxy-S9.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 7164f8922e70616258467a4c3ed74648efd4635e 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 03/14] Fix backlight control on Galaxy S9(+)
-
----
- .../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 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;
- import android.content.Context;
- import android.os.Handler;
- import android.os.Message;
-+import android.os.SystemProperties;
- import android.os.Trace;
- import android.provider.Settings;
- import android.util.Slog;
-@@ -52,6 +53,12 @@ public class LightsService extends SystemService {
- return;
- }
-
-+ String fp = SystemProperties.get("ro.vendor.build.fingerprint", "hello");
-+ if(fp.contains("starlte") || fp.contains("star2lte")) {
-+ setLightLocked(brightness*100, LIGHT_FLASH_HARDWARE, 0, 0, brightnessMode);
-+ return;
-+ }
-+
- int color = brightness & 0x000000ff;
- color = 0xff000000 | (color << 16) | (color << 8) | color;
- setLightLocked(color, LIGHT_FLASH_NONE, 0, 0, brightnessMode);
---
-2.17.1
-
diff --git a/patches/platform_frameworks_base/0004-Relax-requirement-for-visible-flag-to-sdcards.patch b/patches/platform_frameworks_base/0004-Relax-requirement-for-visible-flag-to-sdcards.patch
deleted file mode 100644
index 066c6bb..0000000
--- a/patches/platform_frameworks_base/0004-Relax-requirement-for-visible-flag-to-sdcards.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From d72057d8aebd43b13ef0358c96117df0ef1e8fe3 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 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)
-FBE broke adoptable storage with SDCard, hence this need.
-
-Change-Id: Ia616671c03562d1eadaff5531a5c708a62d7ad3a
----
- .../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 183be9b9875..e8f2ad16a55 100644
---- a/services/core/java/com/android/server/StorageManagerService.java
-+++ b/services/core/java/com/android/server/StorageManagerService.java
-@@ -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.
-- if (vol.disk.isAdoptable()) {
-+ // Assume all SDs match this as well
-+ if (vol.disk.isAdoptable() || vol.disk.isSd()) {
- vol.mountFlags |= VolumeInfo.MOUNT_FLAG_VISIBLE;
- }
-
---
-2.17.1
-
diff --git a/patches/platform_frameworks_base/0005-S9-brightness-override-only-for-screen.patch b/patches/platform_frameworks_base/0005-S9-brightness-override-only-for-screen.patch
deleted file mode 100644
index 9a9a010..0000000
--- a/patches/platform_frameworks_base/0005-S9-brightness-override-only-for-screen.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From ab635fa78777748f2b2245b34bd76204bffbd718 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 05/14] S9 brightness override only for screen
-
----
- .../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 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 {
- return;
- }
-
-- String fp = SystemProperties.get("ro.vendor.build.fingerprint", "hello");
-- if(fp.contains("starlte") || fp.contains("star2lte")) {
-- setLightLocked(brightness*100, LIGHT_FLASH_HARDWARE, 0, 0, brightnessMode);
-- return;
-- }
-+ if(mId == 0) {
-+ String fp = SystemProperties.get("ro.vendor.build.fingerprint", "hello");
-+ if(fp.contains("starlte") || fp.contains("star2lte")) {
-+ setLightLocked(brightness*100, LIGHT_FLASH_HARDWARE, 0, 0, brightnessMode);
-+ return;
-+ }
-+ }
-
- int color = brightness & 0x000000ff;
- color = 0xff000000 | (color << 16) | (color << 8) | color;
---
-2.17.1
-
diff --git a/patches/platform_frameworks_base/0006-Fix-OP6-brightness.patch b/patches/platform_frameworks_base/0006-Fix-OP6-brightness.patch
deleted file mode 100644
index 9c15a0c..0000000
--- a/patches/platform_frameworks_base/0006-Fix-OP6-brightness.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 9912cd1ce35045fbce7b110409897bd17aef9428 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 06/14] Fix OP6 brightness
-
----
- .../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 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")) {
-+ qcomExtendBrightness = true;
-+ scale = 1023;
-+ }
-+
-+ if(qcomExtendBrightness) {
-+ setLightLocked(brightness * scale / 255, LIGHT_FLASH_NONE, 0, 0, brightnessMode);
-+ return;
-+ }
- }
-
- int color = brightness & 0x000000ff;
---
-2.17.1
-
diff --git a/patches/platform_frameworks_base/0007-Try-to-make-brightness-more-generic-using-property-s.patch b/patches/platform_frameworks_base/0007-Try-to-make-brightness-more-generic-using-property-s.patch
deleted file mode 100644
index 921aaac..0000000
--- a/patches/platform_frameworks_base/0007-Try-to-make-brightness-more-generic-using-property-s.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 21df035b893f340af1c57b33c5b8e70d371d66ff 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 07/14] Try to make brightness more generic using property set
- by rw-system
-
----
- .../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 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 {
-
- boolean qcomExtendBrightness = SystemProperties.getBoolean("persist.extend.brightness", false);
- int scale = SystemProperties.getInt("persist.display.max_brightness", 1023);
-- if(fp.contains("OnePlus6")) {
-+ //This is set by vndk-detect
-+ int qcomScale = SystemProperties.getInt("persist.sys.qcom-brightness", -1);
-+ if(qcomScale != -1) {
- qcomExtendBrightness = true;
-- scale = 1023;
-+ scale = qcomScale;
- }
-
- if(qcomExtendBrightness) {
---
-2.17.1
-
diff --git a/patches/platform_frameworks_base/0008-property-matching-RROs-allow-to-prefix-the-value-wit.patch b/patches/platform_frameworks_base/0008-property-matching-RROs-allow-to-prefix-the-value-wit.patch
deleted file mode 100644
index 658d00b..0000000
--- a/patches/platform_frameworks_base/0008-property-matching-RROs-allow-to-prefix-the-value-wit.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 10d626a1a1d41edf4e4e15e0c835a567b0840a6a 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 08/14] property-matching RROs: allow to prefix the value with
- + to do glob match instead of exact match
-
----
- cmds/idmap/scan.cpp | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/cmds/idmap/scan.cpp b/cmds/idmap/scan.cpp
-index d69dd79555a..2be6d23ac78 100644
---- a/cmds/idmap/scan.cpp
-+++ b/cmds/idmap/scan.cpp
-@@ -1,5 +1,6 @@
- #include <dirent.h>
- #include <inttypes.h>
-+#include <fnmatch.h>
- #include <sys/file.h>
- #include <sys/stat.h>
-
-@@ -92,6 +93,10 @@ namespace {
- property_get(prop, propBuf, NULL);
- val = strndup16to8(value.string(), value.size());
-
-+ if(val[0]=='+') {
-+ return fnmatch(val+1, propBuf, 0) != 0;
-+ }
-+
- return (strcmp(propBuf, val) == 0);
- }
-
---
-2.17.1
-
diff --git a/patches/platform_frameworks_base/0009-Fix-typo-on-fnmatch-return-value-check.patch b/patches/platform_frameworks_base/0009-Fix-typo-on-fnmatch-return-value-check.patch
deleted file mode 100644
index f302f9d..0000000
--- a/patches/platform_frameworks_base/0009-Fix-typo-on-fnmatch-return-value-check.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From e7f675d50e17f556f3125ce40b42be6813ac7977 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 09/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 2be6d23ac78..0acff23d031 100644
---- a/cmds/idmap/scan.cpp
-+++ b/cmds/idmap/scan.cpp
-@@ -94,7 +94,7 @@ namespace {
- val = strndup16to8(value.string(), value.size());
-
- if(val[0]=='+') {
-- return fnmatch(val+1, propBuf, 0) != 0;
-+ return fnmatch(val+1, propBuf, 0) == 0;
- }
-
- return (strcmp(propBuf, val) == 0);
---
-2.17.1
-
diff --git a/patches/platform_frameworks_base/0010-Add-Qualcomm-starlte.patch b/patches/platform_frameworks_base/0010-Add-Qualcomm-starlte.patch
deleted file mode 100644
index 1df4369..0000000
--- a/patches/platform_frameworks_base/0010-Add-Qualcomm-starlte.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 8303ad67fcc48bd8ad82c30148ecb0c3d85d6cff 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 10/14] Add Qualcomm starlte
-
----
- .../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 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 {
-
- if(mId == 0) {
- String fp = SystemProperties.get("ro.vendor.build.fingerprint", "hello");
-- if(fp.contains("starlte") || fp.contains("star2lte")) {
-+ if(
-+ fp.contains("starlte") || fp.contains("star2lte") ||
-+ fp.contains("starqlte") || fp.contains("star2qlte")) {
- setLightLocked(brightness*100, LIGHT_FLASH_HARDWARE, 0, 0, brightnessMode);
- return;
- }
---
-2.17.1
-
diff --git a/patches/platform_frameworks_base/0011-remaining-of-HAL-onEnroll-is-actually-a-percent-of-p.patch b/patches/platform_frameworks_base/0011-remaining-of-HAL-onEnroll-is-actually-a-percent-of-p.patch
deleted file mode 100644
index 113ed62..0000000
--- a/patches/platform_frameworks_base/0011-remaining-of-HAL-onEnroll-is-actually-a-percent-of-p.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 42c828a82d5e5633d1779258c17b106f1ea85934 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 11/14] "remaining" of HAL onEnroll is actually a percent of
- progress
-
----
- .../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 06329e571b4..6f09433c002 100644
---- a/services/core/java/com/android/server/fingerprint/FingerprintService.java
-+++ b/services/core/java/com/android/server/fingerprint/FingerprintService.java
-@@ -1046,7 +1046,11 @@ public class FingerprintService extends SystemService implements IHwBinder.Death
- mHandler.post(new Runnable() {
- @Override
- public void run() {
-- handleEnrollResult(deviceId, fingerId, groupId, remaining);
-+ int remaining2 = remaining;
-+ String fp = android.os.SystemProperties.get("ro.vendor.build.fingerprint");
-+ if(fp != null && (fp.contains("starlte") || fp.contains("star2lte") || fp.contains("starqlte") || fp.contains("star2qlte")))
-+ remaining2 = 100 - remaining2;
-+ handleEnrollResult(deviceId, fingerId, groupId, remaining2);
- }
- });
- }
---
-2.17.1
-
diff --git a/patches/platform_frameworks_base/0012-Show-APN-Settings-for-CDMA-carriers.patch b/patches/platform_frameworks_base/0012-Show-APN-Settings-for-CDMA-carriers.patch
deleted file mode 100644
index eaebcd6..0000000
--- a/patches/platform_frameworks_base/0012-Show-APN-Settings-for-CDMA-carriers.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 2cff4112fa997334a939d8bea5f61d3ad27d5489 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 12/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/0013-Change-SignalStrentgh-to-change-behaviour-based-on-p.patch b/patches/platform_frameworks_base/0013-Change-SignalStrentgh-to-change-behaviour-based-on-p.patch
deleted file mode 100644
index c9f3e4b..0000000
--- a/patches/platform_frameworks_base/0013-Change-SignalStrentgh-to-change-behaviour-based-on-p.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From bc7bbdb07645f4ab45ce18424c43d9aa066c6fba 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 13/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
-
diff --git a/patches/platform_frameworks_base/0014-Revert-Reintroduce-button-backlight-and-respective-i.patch b/patches/platform_frameworks_base/0014-Revert-Reintroduce-button-backlight-and-respective-i.patch
deleted file mode 100644
index 3a5dd66..0000000
--- a/patches/platform_frameworks_base/0014-Revert-Reintroduce-button-backlight-and-respective-i.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From 119c6b1f3ca9e359544f5623261368e93d067418 Mon Sep 17 00:00:00 2001
-From: Ricardo Cerqueira <cyanogenmod@cerqueira.org>
-Date: Fri, 23 Nov 2012 14:23:16 +0000
-Subject: [PATCH 14/14] Revert "Reintroduce button-backlight (and respective
- inactivity timeout)"
-
-This reverts commit 035ecde36847f70c7499d576afe1dfa9e130ec8f.
----
- .../server/display/DisplayPowerController.java | 11 -----------
- .../com/android/server/power/PowerManagerService.java | 10 ----------
- 2 files changed, 21 deletions(-)
-
-diff --git a/services/core/java/com/android/server/display/DisplayPowerController.java b/services/core/java/com/android/server/display/DisplayPowerController.java
-index 0b2f487840b..99412c56b27 100644
---- a/services/core/java/com/android/server/display/DisplayPowerController.java
-+++ b/services/core/java/com/android/server/display/DisplayPowerController.java
-@@ -20,7 +20,6 @@ import android.app.ActivityManager;
- import com.android.internal.app.IBatteryStats;
- 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;
-@@ -142,9 +141,6 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
- // Battery stats.
- private final IBatteryStats mBatteryStats;
-
-- // The lights service.
-- private final LightsManager mLights;
--
- // The sensor manager.
- private final SensorManager mSensorManager;
-
-@@ -378,7 +374,6 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
- mCallbacks = callbacks;
-
- mBatteryStats = BatteryStatsService.getService();
-- mLights = LocalServices.getService(LightsManager.class);
- mSensorManager = sensorManager;
- mWindowManagerPolicy = LocalServices.getService(WindowManagerPolicy.class);
- mBlanker = blanker;
-@@ -774,12 +769,6 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
- // Use zero brightness when screen is off.
- if (state == Display.STATE_OFF) {
- brightness = PowerManager.BRIGHTNESS_OFF;
-- mLights.getLight(LightsManager.LIGHT_ID_BUTTONS).setBrightness(brightness);
-- }
--
-- // Disable button lights when dozing
-- if (state == Display.STATE_DOZE || state == Display.STATE_DOZE_SUSPEND) {
-- mLights.getLight(LightsManager.LIGHT_ID_BUTTONS).setBrightness(PowerManager.BRIGHTNESS_OFF);
- }
-
- // 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 4d7c6d24509..a3986fda989 100644
---- a/services/core/java/com/android/server/power/PowerManagerService.java
-+++ b/services/core/java/com/android/server/power/PowerManagerService.java
-@@ -222,8 +222,6 @@ 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;
--
- private final Context mContext;
- private final ServiceThread mHandlerThread;
- private final PowerManagerHandler mHandler;
-@@ -244,7 +242,6 @@ public final class PowerManagerService extends SystemService
- private SettingsObserver mSettingsObserver;
- private DreamManagerInternal mDreamManager;
- private Light mAttentionLight;
-- private Light mButtonsLight;
-
- private final Object mLock = LockGuard.installNewLock(LockGuard.INDEX_POWER);
-
-@@ -773,7 +770,6 @@ public final class PowerManagerService extends SystemService
-
- mLightsManager = getLocalService(LightsManager.class);
- mAttentionLight = mLightsManager.getLight(LightsManager.LIGHT_ID_ATTENTION);
-- mButtonsLight = mLightsManager.getLight(LightsManager.LIGHT_ID_BUTTONS);
-
- // Initialize display power management.
- mDisplayManagerInternal.initPowerManagement(
-@@ -1964,12 +1960,6 @@ public final class PowerManagerService extends SystemService
- nextTimeout = mLastUserActivityTime
- + screenOffTimeout - screenDimDuration;
- if (now < nextTimeout) {
-- if (now > mLastUserActivityTime + BUTTON_ON_DURATION) {
-- mButtonsLight.setBrightness(0);
-- } else {
-- mButtonsLight.setBrightness(mDisplayPowerRequest.screenBrightness);
-- nextTimeout = now + BUTTON_ON_DURATION;
-- }
- mUserActivitySummary = USER_ACTIVITY_SCREEN_BRIGHT;
- } else {
- nextTimeout = mLastUserActivityTime + screenOffTimeout;
---
-2.17.1
-