Update FWB patches
Change-Id: Id971fbf815a2fe3a2e97dd09c042775a594fbc16
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
index ab99e6f..a4d1b92 100644
--- 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
@@ -1,4 +1,4 @@
-From 69d58167da745a41f6f6ef644cee1fc1ceb69376 Mon Sep 17 00:00:00 2001
+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
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
index af53d56..9f13fa2 100644
--- 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
@@ -1,4 +1,4 @@
-From 3706f2a1c164e76b4c706a528bc7ac4894fd96d3 Mon Sep 17 00:00:00 2001
+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
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
index 56683bc..042b82f 100644
--- 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
@@ -1,4 +1,4 @@
-From 9ae6ae97637638189f9a8c632f07f0272ec22c73 Mon Sep 17 00:00:00 2001
+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(+)
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
index eabb351..066c6bb 100644
--- 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
@@ -1,4 +1,4 @@
-From f42553122ec0246adbe1685e3667bc53731cd9fb Mon Sep 17 00:00:00 2001
+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
diff --git a/patches/platform_frameworks_base/0005-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
deleted file mode 100644
index fb42d9e..0000000
--- a/patches/platform_frameworks_base/0005-Don-t-crash-if-there-is-IR-HAL-is-not-declared.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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 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 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 {
- if (!mHasNativeHal) {
- throw new RuntimeException("FEATURE_CONSUMER_IR present, but no IR HAL loaded!");
- }
-- } else if (mHasNativeHal) {
-- throw new RuntimeException("IR HAL present, but FEATURE_CONSUMER_IR is not set!");
- }
- }
-
---
-2.17.1
-
diff --git a/patches/platform_frameworks_base/0006-S9-brightness-override-only-for-screen.patch b/patches/platform_frameworks_base/0005-S9-brightness-override-only-for-screen.patch
similarity index 91%
rename from patches/platform_frameworks_base/0006-S9-brightness-override-only-for-screen.patch
rename to patches/platform_frameworks_base/0005-S9-brightness-override-only-for-screen.patch
index 0a439f3..9a9a010 100644
--- a/patches/platform_frameworks_base/0006-S9-brightness-override-only-for-screen.patch
+++ b/patches/platform_frameworks_base/0005-S9-brightness-override-only-for-screen.patch
@@ -1,7 +1,7 @@
-From fb7d17fad6ee79602330c669d7ce835561be0fb1 Mon Sep 17 00:00:00 2001
+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 06/14] S9 brightness override only for screen
+Subject: [PATCH 05/14] S9 brightness override only for screen
---
.../com/android/server/lights/LightsService.java | 12 +++++++-----
diff --git a/patches/platform_frameworks_base/0007-WIP-Fix-OP6-brightness.patch b/patches/platform_frameworks_base/0006-Fix-OP6-brightness.patch
similarity index 92%
rename from patches/platform_frameworks_base/0007-WIP-Fix-OP6-brightness.patch
rename to patches/platform_frameworks_base/0006-Fix-OP6-brightness.patch
index 7fb90ae..9c15a0c 100644
--- a/patches/platform_frameworks_base/0007-WIP-Fix-OP6-brightness.patch
+++ b/patches/platform_frameworks_base/0006-Fix-OP6-brightness.patch
@@ -1,7 +1,7 @@
-From 6f5006b0114bdca09e64a82d2b02729f1f34655d Mon Sep 17 00:00:00 2001
+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 07/14] [WIP] Fix OP6 brightness
+Subject: [PATCH 06/14] Fix OP6 brightness
---
.../com/android/server/lights/LightsService.java | 12 ++++++++++++
diff --git a/patches/platform_frameworks_base/0008-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
similarity index 91%
rename from patches/platform_frameworks_base/0008-Try-to-make-brightness-more-generic-using-property-s.patch
rename to patches/platform_frameworks_base/0007-Try-to-make-brightness-more-generic-using-property-s.patch
index ab541d4..921aaac 100644
--- a/patches/platform_frameworks_base/0008-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
@@ -1,7 +1,7 @@
-From 51ece7cfa0dbda604386ede0c5a360f06346f755 Mon Sep 17 00:00:00 2001
+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 08/14] Try to make brightness more generic using property set
+Subject: [PATCH 07/14] Try to make brightness more generic using property set
by rw-system
---
diff --git a/patches/platform_frameworks_base/0009-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
similarity index 85%
rename from patches/platform_frameworks_base/0009-property-matching-RROs-allow-to-prefix-the-value-wit.patch
rename to patches/platform_frameworks_base/0008-property-matching-RROs-allow-to-prefix-the-value-wit.patch
index d249c7f..658d00b 100644
--- a/patches/platform_frameworks_base/0009-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
@@ -1,7 +1,7 @@
-From 35348fb993ba80c33ec9ffa2dcc1f5a4747cce87 Mon Sep 17 00:00:00 2001
+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 09/14] property-matching RROs: allow to prefix the value with
+Subject: [PATCH 08/14] property-matching RROs: allow to prefix the value with
+ to do glob match instead of exact match
---
diff --git a/patches/platform_frameworks_base/0010-Fix-typo-on-fnmatch-return-value-check.patch b/patches/platform_frameworks_base/0009-Fix-typo-on-fnmatch-return-value-check.patch
similarity index 82%
rename from patches/platform_frameworks_base/0010-Fix-typo-on-fnmatch-return-value-check.patch
rename to patches/platform_frameworks_base/0009-Fix-typo-on-fnmatch-return-value-check.patch
index 0689689..f302f9d 100644
--- a/patches/platform_frameworks_base/0010-Fix-typo-on-fnmatch-return-value-check.patch
+++ b/patches/platform_frameworks_base/0009-Fix-typo-on-fnmatch-return-value-check.patch
@@ -1,7 +1,7 @@
-From 471462f5c7428037f5bf0670c2d96cba15551dba Mon Sep 17 00:00:00 2001
+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 10/14] Fix typo on fnmatch return value check
+Subject: [PATCH 09/14] Fix typo on fnmatch return value check
---
cmds/idmap/scan.cpp | 2 +-
diff --git a/patches/platform_frameworks_base/0011-Add-Qualcomm-starlte.patch b/patches/platform_frameworks_base/0010-Add-Qualcomm-starlte.patch
similarity index 91%
rename from patches/platform_frameworks_base/0011-Add-Qualcomm-starlte.patch
rename to patches/platform_frameworks_base/0010-Add-Qualcomm-starlte.patch
index 7bd8e17..1df4369 100644
--- a/patches/platform_frameworks_base/0011-Add-Qualcomm-starlte.patch
+++ b/patches/platform_frameworks_base/0010-Add-Qualcomm-starlte.patch
@@ -1,7 +1,7 @@
-From b3de3ae8a9b05017a0bf8329653075bf3b5960ea Mon Sep 17 00:00:00 2001
+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 11/14] Add Qualcomm starlte
+Subject: [PATCH 10/14] Add Qualcomm starlte
---
.../core/java/com/android/server/lights/LightsService.java | 4 +++-
diff --git a/patches/platform_frameworks_base/0012-Galaxy-S9-remaining-of-HAL-onEnroll-is-actually-a-pe.patch b/patches/platform_frameworks_base/0011-remaining-of-HAL-onEnroll-is-actually-a-percent-of-p.patch
similarity index 88%
rename from patches/platform_frameworks_base/0012-Galaxy-S9-remaining-of-HAL-onEnroll-is-actually-a-pe.patch
rename to patches/platform_frameworks_base/0011-remaining-of-HAL-onEnroll-is-actually-a-percent-of-p.patch
index affb9ba..113ed62 100644
--- a/patches/platform_frameworks_base/0012-Galaxy-S9-remaining-of-HAL-onEnroll-is-actually-a-pe.patch
+++ b/patches/platform_frameworks_base/0011-remaining-of-HAL-onEnroll-is-actually-a-percent-of-p.patch
@@ -1,8 +1,8 @@
-From 4e3b41d78574dbb3398c3464e68be708cbb9f553 Mon Sep 17 00:00:00 2001
+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 12/14] [Galaxy S9] "remaining" of HAL onEnroll is actually a
- percent of progress
+Subject: [PATCH 11/14] "remaining" of HAL onEnroll is actually a percent of
+ progress
---
.../com/android/server/fingerprint/FingerprintService.java | 6 +++++-
diff --git a/patches/platform_frameworks_base/0013-Show-APN-Settings-for-CDMA-carriers.patch b/patches/platform_frameworks_base/0012-Show-APN-Settings-for-CDMA-carriers.patch
similarity index 90%
rename from patches/platform_frameworks_base/0013-Show-APN-Settings-for-CDMA-carriers.patch
rename to patches/platform_frameworks_base/0012-Show-APN-Settings-for-CDMA-carriers.patch
index 1431098..eaebcd6 100644
--- a/patches/platform_frameworks_base/0013-Show-APN-Settings-for-CDMA-carriers.patch
+++ b/patches/platform_frameworks_base/0012-Show-APN-Settings-for-CDMA-carriers.patch
@@ -1,7 +1,7 @@
-From 053b2324df01b1acfd36216782e01f1890dfceab Mon Sep 17 00:00:00 2001
+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 13/14] Show APN Settings for CDMA carriers
+Subject: [PATCH 12/14] Show APN Settings for CDMA carriers
---
telephony/java/android/telephony/CarrierConfigManager.java | 2 +-
diff --git a/patches/platform_frameworks_base/0014-Change-SignalStrentgh-to-change-behaviour-based-on-p.patch b/patches/platform_frameworks_base/0013-Change-SignalStrentgh-to-change-behaviour-based-on-p.patch
similarity index 96%
rename from patches/platform_frameworks_base/0014-Change-SignalStrentgh-to-change-behaviour-based-on-p.patch
rename to patches/platform_frameworks_base/0013-Change-SignalStrentgh-to-change-behaviour-based-on-p.patch
index 5d20653..c9f3e4b 100644
--- a/patches/platform_frameworks_base/0014-Change-SignalStrentgh-to-change-behaviour-based-on-p.patch
+++ b/patches/platform_frameworks_base/0013-Change-SignalStrentgh-to-change-behaviour-based-on-p.patch
@@ -1,7 +1,7 @@
-From ff10685c75c5aa837ce70cb572ec5180a7f496d2 Mon Sep 17 00:00:00 2001
+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 14/14] Change SignalStrentgh to change behaviour based on
+Subject: [PATCH 13/14] Change SignalStrentgh to change behaviour based on
property
Change-Id: I9e8bec3dd41ecc983e007f6d00157170ac0a3e28
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
new file mode 100644
index 0000000..3a5dd66
--- /dev/null
+++ b/patches/platform_frameworks_base/0014-Revert-Reintroduce-button-backlight-and-respective-i.patch
@@ -0,0 +1,100 @@
+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
+