treble_patches: Update all patches per BlissRoms Source
Change-Id: I1371da94679a6c859e08f86b4a17b14281dfae81
Signed-off-by: Jackeagle <jackeagle102@gmail.com>
diff --git a/patches/platform_frameworks_base/0001-Revert-Telephony-Stop-using-rssnr-it-falsly-shows-wr.patch b/patches/platform_frameworks_base/0001-Revert-Telephony-Stop-using-rssnr-it-falsly-shows-wr.patch
new file mode 100644
index 0000000..a2c13bb
--- /dev/null
+++ b/patches/platform_frameworks_base/0001-Revert-Telephony-Stop-using-rssnr-it-falsly-shows-wr.patch
@@ -0,0 +1,28 @@
+From 06588b0051026c442e024a832ea29b991ff6525c Mon Sep 17 00:00:00 2001
+From: Jackeagle <jackeagle102@gmail.com>
+Date: Thu, 18 Oct 2018 04:55:17 -0400
+Subject: [PATCH 01/26] Revert "Telephony: Stop using rssnr, it falsly shows
+ wrong signal bars"
+
+This reverts commit b9ff83d0b1d5a81d55057ae2fa892e5d0f1083be.
+---
+ telephony/java/android/telephony/SignalStrength.java | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/telephony/java/android/telephony/SignalStrength.java b/telephony/java/android/telephony/SignalStrength.java
+index 55c0c77..4e56396 100644
+--- a/telephony/java/android/telephony/SignalStrength.java
++++ b/telephony/java/android/telephony/SignalStrength.java
+@@ -897,9 +897,6 @@ public class SignalStrength implements Parcelable {
+ + rsrpIconLevel + " snrIconLevel:" + snrIconLevel
+ + " lteRsrpBoost:" + mLteRsrpBoost);
+
+- /* Ignore RSSNR for now */
+- if(rsrpIconLevel != -1) return rsrpIconLevel;
+-
+ /* Choose a measurement type to use for notification */
+ if (snrIconLevel != -1 && rsrpIconLevel != -1) {
+ /*
+--
+2.7.4
+
diff --git a/patches/platform_frameworks_base/0001-Fix-backlight-control-on-Galaxy-S9.patch b/patches/platform_frameworks_base/0002-Fix-backlight-control-on-Galaxy-S9.patch
similarity index 91%
rename from patches/platform_frameworks_base/0001-Fix-backlight-control-on-Galaxy-S9.patch
rename to patches/platform_frameworks_base/0002-Fix-backlight-control-on-Galaxy-S9.patch
index de37111..d994ca4 100644
--- a/patches/platform_frameworks_base/0001-Fix-backlight-control-on-Galaxy-S9.patch
+++ b/patches/platform_frameworks_base/0002-Fix-backlight-control-on-Galaxy-S9.patch
@@ -1,7 +1,7 @@
-From b2c2b9cb96329710a39c6905004012f96a1c7b98 Mon Sep 17 00:00:00 2001
+From 8d2e50a9e6932d4c0a65269a3e8ad9743912686d 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 01/24] Fix backlight control on Galaxy S9(+)
+Subject: [PATCH 02/26] Fix backlight control on Galaxy S9(+)
---
services/core/java/com/android/server/lights/LightsService.java | 7 +++++++
diff --git a/patches/platform_frameworks_base/0001-Revert-Revert-Remove-getIntWithSubId-in-TelephonyMan.patch b/patches/platform_frameworks_base/0003-Revert-Revert-Remove-getIntWithSubId-in-TelephonyMan.patch
similarity index 86%
rename from patches/platform_frameworks_base/0001-Revert-Revert-Remove-getIntWithSubId-in-TelephonyMan.patch
rename to patches/platform_frameworks_base/0003-Revert-Revert-Remove-getIntWithSubId-in-TelephonyMan.patch
index be07474..18c5098 100644
--- a/patches/platform_frameworks_base/0001-Revert-Revert-Remove-getIntWithSubId-in-TelephonyMan.patch
+++ b/patches/platform_frameworks_base/0003-Revert-Revert-Remove-getIntWithSubId-in-TelephonyMan.patch
@@ -1,22 +1,22 @@
-From eee4d12d38bdbdab39abcd9c280eda864fd26855 Mon Sep 17 00:00:00 2001
+From 76ad65fa9d4689eed28b24b9ba55059389a6cf96 Mon Sep 17 00:00:00 2001
From: jhenrique09 <jhenrique09.mcz@hotmail.com>
Date: Sat, 11 Aug 2018 13:40:00 -0400
-Subject: [PATCH] Revert "Revert "Remove getIntWithSubId in TelephonyManager.""
+Subject: [PATCH 03/26] Revert "Revert "Remove getIntWithSubId in
+ TelephonyManager.""
This reverts commit e788decb1b366a9df9683d86314ea4cf22a10d74.
---
- .../android/telephony/TelephonyManager.java | 39 -------------------
+ .../java/android/telephony/TelephonyManager.java | 39 ----------------------
1 file changed, 39 deletions(-)
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
-index 10dc43ae539..487490c194b 100644
+index 3ecb6bb..b916a79 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
-@@ -6629,45 +6629,6 @@ public class TelephonyManager {
- return false;
+@@ -6633,45 +6633,6 @@ public class TelephonyManager {
}
-- /**
+ /**
- * This function retrieves value for setting "name+subId", and if that is not found
- * retrieves value for setting "name", and if that is not found throws
- * SettingNotFoundException
@@ -55,9 +55,10 @@
- }
- }
-
- /**
+- /**
* Returns the IMS Registration Status for a particular Subscription ID.
*
+ * @param subId Subscription ID
--
-2.17.1
+2.7.4
diff --git a/patches/platform_frameworks_base/0002-Relax-requirement-for-visible-flag-to-sdcards.patch b/patches/platform_frameworks_base/0004-Relax-requirement-for-visible-flag-to-sdcards.patch
similarity index 88%
rename from patches/platform_frameworks_base/0002-Relax-requirement-for-visible-flag-to-sdcards.patch
rename to patches/platform_frameworks_base/0004-Relax-requirement-for-visible-flag-to-sdcards.patch
index fc3d32a..cf63de5 100644
--- a/patches/platform_frameworks_base/0002-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 dd8e7e51438d072915a1f5b4b69802f03587c83b Mon Sep 17 00:00:00 2001
+From bce6b073e39f1c12839debc4e1df55f992bf4409 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 02/24] Relax requirement for visible flag to sdcards
+Subject: [PATCH 04/26] 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)
@@ -13,7 +13,7 @@
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 183be9b..e8f2ad1 100644
+index a35357f..14ca559 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
diff --git a/patches/platform_frameworks_base/0003-Also-scan-system-overlay.patch b/patches/platform_frameworks_base/0005-Also-scan-system-overlay.patch
similarity index 94%
rename from patches/platform_frameworks_base/0003-Also-scan-system-overlay.patch
rename to patches/platform_frameworks_base/0005-Also-scan-system-overlay.patch
index e0b9184..c499e5e 100644
--- a/patches/platform_frameworks_base/0003-Also-scan-system-overlay.patch
+++ b/patches/platform_frameworks_base/0005-Also-scan-system-overlay.patch
@@ -1,7 +1,7 @@
-From 8a823e4362dcc08ae4622ba09b72596ca08ae099 Mon Sep 17 00:00:00 2001
+From 11e5882f79432d04eda5dc7415a33ce051db14d5 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 03/24] Also scan /system/overlay
+Subject: [PATCH 05/26] Also scan /system/overlay
Change-Id: Ib0223560606b80cdaaa986b159b34b4db0154589
---
diff --git a/patches/platform_frameworks_base/0004-Don-t-crash-if-there-is-IR-HAL-is-not-declared.patch b/patches/platform_frameworks_base/0006-Don-t-crash-if-there-is-IR-HAL-is-not-declared.patch
similarity index 87%
rename from patches/platform_frameworks_base/0004-Don-t-crash-if-there-is-IR-HAL-is-not-declared.patch
rename to patches/platform_frameworks_base/0006-Don-t-crash-if-there-is-IR-HAL-is-not-declared.patch
index 0dbfef9..9fb6edb 100644
--- a/patches/platform_frameworks_base/0004-Don-t-crash-if-there-is-IR-HAL-is-not-declared.patch
+++ b/patches/platform_frameworks_base/0006-Don-t-crash-if-there-is-IR-HAL-is-not-declared.patch
@@ -1,7 +1,7 @@
-From 1f4cb580636ba7f82def71ddb884c00b47de4ead Mon Sep 17 00:00:00 2001
+From cb0dd6d660d6bfdf2127bbe7cc0239eca775eb75 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 04/24] Don't crash if there is IR HAL is not declared
+Subject: [PATCH 06/26] Don't crash if there is IR HAL is not declared
---
services/core/java/com/android/server/ConsumerIrService.java | 2 --
diff --git a/patches/platform_frameworks_base/0005-Fix-62.patch b/patches/platform_frameworks_base/0007-Fix-62.patch
similarity index 83%
rename from patches/platform_frameworks_base/0005-Fix-62.patch
rename to patches/platform_frameworks_base/0007-Fix-62.patch
index f75875c..1b68961 100644
--- a/patches/platform_frameworks_base/0005-Fix-62.patch
+++ b/patches/platform_frameworks_base/0007-Fix-62.patch
@@ -1,17 +1,17 @@
-From b19f552664e7ee8139660109b052628d3762d9da Mon Sep 17 00:00:00 2001
+From df2b78aa40160a50dc2bd50c8b4debfe1662179c 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 05/24] Fix(?) #62
+Subject: [PATCH 07/26] 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 62cd13b..7efbdb8 100644
+index 8a8a569..98df114 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java
-@@ -891,7 +891,10 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener {
+@@ -898,7 +898,10 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener {
@Override
public void onAuthenticationError(int errMsgId, CharSequence errString) {
diff --git a/patches/platform_frameworks_base/0006-S9-brightness-override-only-for-screen.patch b/patches/platform_frameworks_base/0008-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/0008-S9-brightness-override-only-for-screen.patch
index 341f2ae..e31aafa 100644
--- a/patches/platform_frameworks_base/0006-S9-brightness-override-only-for-screen.patch
+++ b/patches/platform_frameworks_base/0008-S9-brightness-override-only-for-screen.patch
@@ -1,7 +1,7 @@
-From e7bdcc38ea79b50bbd83880b9698c0bd537761e1 Mon Sep 17 00:00:00 2001
+From 5aaac501604c1a512a74a1a683bd3b0d426d5e46 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/24] S9 brightness override only for screen
+Subject: [PATCH 08/26] S9 brightness override only for screen
---
.../core/java/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/0009-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/0009-Fix-OP6-brightness.patch
index 4e26971..688c3a9 100644
--- a/patches/platform_frameworks_base/0007-WIP-Fix-OP6-brightness.patch
+++ b/patches/platform_frameworks_base/0009-Fix-OP6-brightness.patch
@@ -1,7 +1,7 @@
-From 2506649f52ddfa278f416b07ee4482d848fdc93b Mon Sep 17 00:00:00 2001
+From 2f75c91fb2bdd2647dd1954a82ae0051a0a00ac6 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/24] [WIP] Fix OP6 brightness
+Subject: [PATCH 09/26] Fix OP6 brightness
---
.../core/java/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/0010-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/0010-Try-to-make-brightness-more-generic-using-property-s.patch
index c1e70da..88a774e 100644
--- a/patches/platform_frameworks_base/0008-Try-to-make-brightness-more-generic-using-property-s.patch
+++ b/patches/platform_frameworks_base/0010-Try-to-make-brightness-more-generic-using-property-s.patch
@@ -1,7 +1,7 @@
-From d6f620db49e75e1a460539d1ae5b403a9f025d8b Mon Sep 17 00:00:00 2001
+From 2e537ac68e587286bee27ff78cd6154ed9923683 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/24] Try to make brightness more generic using property set
+Subject: [PATCH 10/26] 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/0011-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/0011-property-matching-RROs-allow-to-prefix-the-value-wit.patch
index 065ac7e..653e8dd 100644
--- a/patches/platform_frameworks_base/0009-property-matching-RROs-allow-to-prefix-the-value-wit.patch
+++ b/patches/platform_frameworks_base/0011-property-matching-RROs-allow-to-prefix-the-value-wit.patch
@@ -1,7 +1,7 @@
-From e0d43bc1ca5758ce0ac084939521cd68f9197ae7 Mon Sep 17 00:00:00 2001
+From f7dd56eb01d249e15fbff250dc3939751770511c 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/24] property-matching RROs: allow to prefix the value with
+Subject: [PATCH 11/26] 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/0012-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/0012-Fix-typo-on-fnmatch-return-value-check.patch
index 5816fc1..867df17 100644
--- a/patches/platform_frameworks_base/0010-Fix-typo-on-fnmatch-return-value-check.patch
+++ b/patches/platform_frameworks_base/0012-Fix-typo-on-fnmatch-return-value-check.patch
@@ -1,7 +1,7 @@
-From dd47f7bcafb7eb8b8f8a6667928817ec3b27015d Mon Sep 17 00:00:00 2001
+From c76d3ec31672441e234863a864edcb81b30ac5b9 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/24] Fix typo on fnmatch return value check
+Subject: [PATCH 12/26] 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/0013-Add-Qualcomm-starlte.patch
similarity index 91%
rename from patches/platform_frameworks_base/0011-Add-Qualcomm-starlte.patch
rename to patches/platform_frameworks_base/0013-Add-Qualcomm-starlte.patch
index 998c502..194c040 100644
--- a/patches/platform_frameworks_base/0011-Add-Qualcomm-starlte.patch
+++ b/patches/platform_frameworks_base/0013-Add-Qualcomm-starlte.patch
@@ -1,7 +1,7 @@
-From 5c2cdaa8533ac293a72337b033e98a4f5d717a03 Mon Sep 17 00:00:00 2001
+From 672a57ba8016499f4c78b63ce4ec56ff4ae1162b 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/24] Add Qualcomm starlte
+Subject: [PATCH 13/26] Add Qualcomm starlte
---
services/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/0014-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/0014-remaining-of-HAL-onEnroll-is-actually-a-percent-of-p.patch
index 622c11f..006c736 100644
--- a/patches/platform_frameworks_base/0012-Galaxy-S9-remaining-of-HAL-onEnroll-is-actually-a-pe.patch
+++ b/patches/platform_frameworks_base/0014-remaining-of-HAL-onEnroll-is-actually-a-percent-of-p.patch
@@ -1,8 +1,8 @@
-From 247c7ff4d9a34ee7408a12337de390961e4b5807 Mon Sep 17 00:00:00 2001
+From 193e90216abdd2758da4c42935bf2bf792bffa46 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/24] [Galaxy S9] "remaining" of HAL onEnroll is actually a
- percent of progress
+Subject: [PATCH 14/26] "remaining" of HAL onEnroll is actually a percent of
+ progress
---
.../java/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/0015-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/0015-Show-APN-Settings-for-CDMA-carriers.patch
index aebf6d1..226f8f6 100644
--- a/patches/platform_frameworks_base/0013-Show-APN-Settings-for-CDMA-carriers.patch
+++ b/patches/platform_frameworks_base/0015-Show-APN-Settings-for-CDMA-carriers.patch
@@ -1,7 +1,7 @@
-From 931f6337927bb48c1775bd8f3111e972edebc399 Mon Sep 17 00:00:00 2001
+From 450bb6695075a8307306d87c45fe4de06be9b544 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/24] Show APN Settings for CDMA carriers
+Subject: [PATCH 15/26] 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/0016-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/0016-Change-SignalStrentgh-to-change-behaviour-based-on-p.patch
index 93fa4cd..2812eb2 100644
--- a/patches/platform_frameworks_base/0014-Change-SignalStrentgh-to-change-behaviour-based-on-p.patch
+++ b/patches/platform_frameworks_base/0016-Change-SignalStrentgh-to-change-behaviour-based-on-p.patch
@@ -1,7 +1,7 @@
-From 623d831f338a1a4f824ae3529c9268bc83ba1fcf Mon Sep 17 00:00:00 2001
+From 372ab41c59413ba81891195d72f6ebde33eb9b08 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/24] Change SignalStrentgh to change behaviour based on
+Subject: [PATCH 16/26] Change SignalStrentgh to change behaviour based on
property
Change-Id: I940ed724047567ec5195ac93ea04574c3d92f70b
diff --git a/patches/platform_frameworks_base/0015-idmap-Don-t-silently-ignore-RROs-with-same-priority.patch b/patches/platform_frameworks_base/0017-idmap-Don-t-silently-ignore-RROs-with-same-priority.patch
similarity index 82%
rename from patches/platform_frameworks_base/0015-idmap-Don-t-silently-ignore-RROs-with-same-priority.patch
rename to patches/platform_frameworks_base/0017-idmap-Don-t-silently-ignore-RROs-with-same-priority.patch
index 493e2e4..190c4c2 100644
--- a/patches/platform_frameworks_base/0015-idmap-Don-t-silently-ignore-RROs-with-same-priority.patch
+++ b/patches/platform_frameworks_base/0017-idmap-Don-t-silently-ignore-RROs-with-same-priority.patch
@@ -1,7 +1,7 @@
-From 79cbaa11b6a5fcd7caa7d075d1ff959f78c01bfb Mon Sep 17 00:00:00 2001
+From 01ca7e2062fe3986d7a978c04b6ad7b63d8adb23 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Sun, 19 Aug 2018 10:51:06 +0200
-Subject: [PATCH 15/24] idmap: Don't silently ignore RROs with same priority
+Subject: [PATCH 17/26] idmap: Don't silently ignore RROs with same priority
Change-Id: I64a6899f1b30e0cd9e9a872b7ca83d831f038cbe
---
diff --git a/patches/platform_frameworks_base/0016-Move-SysuiDarkThemeOverlay-to-system.patch b/patches/platform_frameworks_base/0018-Move-SysuiDarkThemeOverlay-to-system.patch
similarity index 85%
rename from patches/platform_frameworks_base/0016-Move-SysuiDarkThemeOverlay-to-system.patch
rename to patches/platform_frameworks_base/0018-Move-SysuiDarkThemeOverlay-to-system.patch
index 309e603..ec1ec55 100644
--- a/patches/platform_frameworks_base/0016-Move-SysuiDarkThemeOverlay-to-system.patch
+++ b/patches/platform_frameworks_base/0018-Move-SysuiDarkThemeOverlay-to-system.patch
@@ -1,7 +1,7 @@
-From 5bbfd5e6a364cae032f4f85a8680385d4c16b27f Mon Sep 17 00:00:00 2001
+From 4dd5e23ac2e61f674e7693e88da13d16394b450a Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Sun, 19 Aug 2018 10:57:21 +0200
-Subject: [PATCH 16/24] Move SysuiDarkThemeOverlay to /system
+Subject: [PATCH 18/26] Move SysuiDarkThemeOverlay to /system
Change-Id: I31b3edc5d1abcc1163a13e63c909fee9d27ff432
---
diff --git a/patches/platform_frameworks_base/0017-Reintroduce-button-backlight-and-respective-inactivi.patch b/patches/platform_frameworks_base/0019-Reintroduce-button-backlight-and-respective-inactivi.patch
similarity index 80%
rename from patches/platform_frameworks_base/0017-Reintroduce-button-backlight-and-respective-inactivi.patch
rename to patches/platform_frameworks_base/0019-Reintroduce-button-backlight-and-respective-inactivi.patch
index 14e8fda..f5e4c6f 100644
--- a/patches/platform_frameworks_base/0017-Reintroduce-button-backlight-and-respective-inactivi.patch
+++ b/patches/platform_frameworks_base/0019-Reintroduce-button-backlight-and-respective-inactivi.patch
@@ -1,7 +1,7 @@
-From 673e875be80b6341ed2f644c8f691dc36c383023 Mon Sep 17 00:00:00 2001
+From 4b97606860972babc31af062db1a1b8345942f28 Mon Sep 17 00:00:00 2001
From: Ricardo Cerqueira <cyanogenmod@cerqueira.org>
Date: Fri, 23 Nov 2012 14:23:16 +0000
-Subject: [PATCH 17/24] Reintroduce button-backlight (and respective inactivity
+Subject: [PATCH 19/26] Reintroduce button-backlight (and respective inactivity
timeout)
The power manager rewrite from Change I1d7a52e98f0449f76d70bf421f6a7f245957d1d7
@@ -14,12 +14,12 @@
Change-Id: I6094c446e0b8c23f57d30652a3cbd35dee5e821a
---
- .../android/server/display/DisplayPowerController.java | 11 +++++++++++
- .../com/android/server/power/PowerManagerService.java | 15 +++++++++++++++
- 2 files changed, 26 insertions(+)
+ .../com/android/server/display/DisplayPowerController.java | 11 +++++++++++
+ .../java/com/android/server/power/PowerManagerService.java | 12 ++++++++++++
+ 2 files changed, 23 insertions(+)
diff --git a/services/core/java/com/android/server/display/DisplayPowerController.java b/services/core/java/com/android/server/display/DisplayPowerController.java
-index 99412c5..bb6f65c 100644
+index db3368a..1f96902 100644
--- a/services/core/java/com/android/server/display/DisplayPowerController.java
+++ b/services/core/java/com/android/server/display/DisplayPowerController.java
@@ -21,6 +21,7 @@ import com.android.internal.app.IBatteryStats;
@@ -30,7 +30,7 @@
import android.animation.Animator;
import android.animation.ObjectAnimator;
-@@ -141,6 +142,9 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
+@@ -144,6 +145,9 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
// Battery stats.
private final IBatteryStats mBatteryStats;
@@ -40,7 +40,7 @@
// The sensor manager.
private final SensorManager mSensorManager;
-@@ -374,6 +378,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
+@@ -387,6 +391,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;
-@@ -769,6 +774,12 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
+@@ -837,6 +842,12 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
// Use zero brightness when screen is off.
if (state == Display.STATE_OFF) {
brightness = PowerManager.BRIGHTNESS_OFF;
@@ -62,23 +62,20 @@
// 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 697801f..9b8584e 100644
+index d39401d..b325810 100644
--- a/services/core/java/com/android/server/power/PowerManagerService.java
+++ b/services/core/java/com/android/server/power/PowerManagerService.java
-@@ -222,6 +222,12 @@ public final class PowerManagerService extends SystemService
- // Persistent property for last reboot reason
- private static final String LAST_REBOOT_PROPERTY = "persist.sys.boot.reason";
+@@ -230,6 +230,9 @@ public final class PowerManagerService extends SystemService
+
+ private static final float PROXIMITY_NEAR_THRESHOLD = 5.0f;
+ // Add button light timeout
+ 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";
-+
private final Context mContext;
private final ServiceThread mHandlerThread;
private final PowerManagerHandler mHandler;
-@@ -242,6 +248,7 @@ public final class PowerManagerService extends SystemService
+@@ -250,6 +253,7 @@ public final class PowerManagerService extends SystemService
private SettingsObserver mSettingsObserver;
private DreamManagerInternal mDreamManager;
private Light mAttentionLight;
@@ -86,7 +83,7 @@
private final Object mLock = LockGuard.installNewLock(LockGuard.INDEX_POWER);
-@@ -770,6 +777,7 @@ public final class PowerManagerService extends SystemService
+@@ -792,6 +796,7 @@ public final class PowerManagerService extends SystemService
mLightsManager = getLocalService(LightsManager.class);
mAttentionLight = mLightsManager.getLight(LightsManager.LIGHT_ID_ATTENTION);
@@ -94,7 +91,7 @@
// Initialize display power management.
mDisplayManagerInternal.initPowerManagement(
-@@ -1953,6 +1961,7 @@ public final class PowerManagerService extends SystemService
+@@ -1997,6 +2002,7 @@ public final class PowerManagerService extends SystemService
final long screenOffTimeout = getScreenOffTimeoutLocked(sleepTimeout);
final long screenDimDuration = getScreenDimDurationLocked(screenOffTimeout);
final boolean userInactiveOverride = mUserInactiveOverrideFromWindowManager;
@@ -102,7 +99,7 @@
final long nextProfileTimeout = getNextProfileTimeoutLocked(now);
mUserActivitySummary = 0;
-@@ -1960,6 +1969,12 @@ public final class PowerManagerService extends SystemService
+@@ -2004,6 +2010,12 @@ public final class PowerManagerService extends SystemService
nextTimeout = mLastUserActivityTime
+ screenOffTimeout - screenDimDuration;
if (now < nextTimeout) {
diff --git a/patches/platform_frameworks_base/0018-power-Disable-keyboard-button-lights-while-dozing-dr.patch b/patches/platform_frameworks_base/0020-power-Disable-keyboard-button-lights-while-dozing-dr.patch
similarity index 84%
rename from patches/platform_frameworks_base/0018-power-Disable-keyboard-button-lights-while-dozing-dr.patch
rename to patches/platform_frameworks_base/0020-power-Disable-keyboard-button-lights-while-dozing-dr.patch
index f6302ae..07f6129 100644
--- a/patches/platform_frameworks_base/0018-power-Disable-keyboard-button-lights-while-dozing-dr.patch
+++ b/patches/platform_frameworks_base/0020-power-Disable-keyboard-button-lights-while-dozing-dr.patch
@@ -1,7 +1,7 @@
-From 5ad35a38c15110b486c69b830acc724312e9d764 Mon Sep 17 00:00:00 2001
+From 5036b3d244cb7b784688f6fcf3d9cec74b796ac0 Mon Sep 17 00:00:00 2001
From: Steve Kondik <steve@cyngn.com>
Date: Sat, 3 Jan 2015 05:13:26 -0800
-Subject: [PATCH 18/24] power: Disable keyboard/button lights while
+Subject: [PATCH 20/26] power: Disable keyboard/button lights while
dozing/dreaming
* With hardkeys and doze mode enabled, entering suspend results in
@@ -14,10 +14,10 @@
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 9b8584e..0620f2e 100644
+index b325810..1ac93c7 100644
--- a/services/core/java/com/android/server/power/PowerManagerService.java
+++ b/services/core/java/com/android/server/power/PowerManagerService.java
-@@ -1965,7 +1965,7 @@ public final class PowerManagerService extends SystemService
+@@ -2006,7 +2006,7 @@ public final class PowerManagerService extends SystemService
final long nextProfileTimeout = getNextProfileTimeoutLocked(now);
mUserActivitySummary = 0;
diff --git a/patches/platform_frameworks_base/0019-It-is-okay-not-to-have-wifi-in-SystemUI-on-FDE-lock.patch b/patches/platform_frameworks_base/0021-It-is-okay-not-to-have-wifi-in-SystemUI-on-FDE-lock.patch
similarity index 95%
rename from patches/platform_frameworks_base/0019-It-is-okay-not-to-have-wifi-in-SystemUI-on-FDE-lock.patch
rename to patches/platform_frameworks_base/0021-It-is-okay-not-to-have-wifi-in-SystemUI-on-FDE-lock.patch
index e2104b9..40703d6 100644
--- a/patches/platform_frameworks_base/0019-It-is-okay-not-to-have-wifi-in-SystemUI-on-FDE-lock.patch
+++ b/patches/platform_frameworks_base/0021-It-is-okay-not-to-have-wifi-in-SystemUI-on-FDE-lock.patch
@@ -1,7 +1,7 @@
-From fa4491e99b8b4cccd3d7ba8bc9170a1eb83a7c20 Mon Sep 17 00:00:00 2001
+From aabb69b5de04daa55c6576dea758a0fa838dea25 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Mon, 20 Aug 2018 22:27:02 +0200
-Subject: [PATCH 19/24] It is okay not to have wifi in SystemUI (on FDE lock)
+Subject: [PATCH 21/26] It is okay not to have wifi in SystemUI (on FDE lock)
---
.../SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java | 2 +-
diff --git a/patches/platform_frameworks_base/0020-Don-t-wake-IR-HAL-to-the-infinity-and-beyond.patch b/patches/platform_frameworks_base/0022-Don-t-wake-IR-HAL-to-the-infinity-and-beyond.patch
similarity index 92%
rename from patches/platform_frameworks_base/0020-Don-t-wake-IR-HAL-to-the-infinity-and-beyond.patch
rename to patches/platform_frameworks_base/0022-Don-t-wake-IR-HAL-to-the-infinity-and-beyond.patch
index 27c57c5..b42fdf3 100644
--- a/patches/platform_frameworks_base/0020-Don-t-wake-IR-HAL-to-the-infinity-and-beyond.patch
+++ b/patches/platform_frameworks_base/0022-Don-t-wake-IR-HAL-to-the-infinity-and-beyond.patch
@@ -1,7 +1,7 @@
-From 15f136280d06ae3f10bb4b3b5caa2950ea06d0de Mon Sep 17 00:00:00 2001
+From 52b034278a9809942e93a1d630b38d2050b74615 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Tue, 21 Aug 2018 22:24:02 +0200
-Subject: [PATCH 20/24] Don't wake IR HAL to the infinity and beyond
+Subject: [PATCH 22/26] Don't wake IR HAL to the infinity and beyond
---
services/core/java/com/android/server/ConsumerIrService.java | 5 -----
diff --git a/patches/platform_frameworks_base/0023-Add-a-property-to-override-pre-o-max-aspect-ratio.patch b/patches/platform_frameworks_base/0023-Add-a-property-to-override-pre-o-max-aspect-ratio.patch
deleted file mode 100644
index 608f75f..0000000
--- a/patches/platform_frameworks_base/0023-Add-a-property-to-override-pre-o-max-aspect-ratio.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From a062513185f4b260acc722b5952f6fea2db6f75a Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <phh@phh.me>
-Date: Wed, 29 Aug 2018 11:05:54 +0200
-Subject: [PATCH 23/24] Add a property to override pre-o max aspect ratio
-
----
- services/core/java/com/android/server/am/ActivityRecord.java | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/services/core/java/com/android/server/am/ActivityRecord.java b/services/core/java/com/android/server/am/ActivityRecord.java
-index 75f2723..28f6eae 100644
---- a/services/core/java/com/android/server/am/ActivityRecord.java
-+++ b/services/core/java/com/android/server/am/ActivityRecord.java
-@@ -163,6 +163,7 @@ import android.os.PersistableBundle;
- import android.os.Process;
- import android.os.RemoteException;
- import android.os.SystemClock;
-+import android.os.SystemProperties;
- import android.os.Trace;
- import android.os.UserHandle;
- import android.os.storage.StorageManager;
-@@ -2421,7 +2422,7 @@ final class ActivityRecord extends ConfigurationContainer implements AppWindowCo
- // TODO(b/36505427): Consider moving this method and similar ones to ConfigurationContainer.
- private void computeBounds(Rect outBounds) {
- outBounds.setEmpty();
-- final float maxAspectRatio = info.maxAspectRatio;
-+ float maxAspectRatio = info.maxAspectRatio;
- final ActivityStack stack = getStack();
- if (task == null || stack == null || task.inMultiWindowMode() || maxAspectRatio == 0
- || isInVrUiMode(getConfiguration())) {
-@@ -2432,6 +2433,12 @@ final class ActivityRecord extends ConfigurationContainer implements AppWindowCo
- return;
- }
-
-+ if(info.applicationInfo.targetSdkVersion < O) {
-+ try {
-+ maxAspectRatio = Float.parseFloat(SystemProperties.get("persist.sys.max_aspect_ratio.pre_o", ""));
-+ } catch (Throwable t) {}
-+ Log.d("PHH", "Overrode aspect ratio because pre-o to " + maxAspectRatio);
-+ }
- // We must base this on the parent configuration, because we set our override
- // configuration's appBounds based on the result of this method. If we used our own
- // configuration, it would be influenced by past invocations.
---
-2.7.4
-
diff --git a/patches/platform_frameworks_base/0021-Switch-samsung-light-fingerprint-match-to-regexp-to-.patch b/patches/platform_frameworks_base/0023-Switch-samsung-light-fingerprint-match-to-regexp-to-.patch
similarity index 90%
rename from patches/platform_frameworks_base/0021-Switch-samsung-light-fingerprint-match-to-regexp-to-.patch
rename to patches/platform_frameworks_base/0023-Switch-samsung-light-fingerprint-match-to-regexp-to-.patch
index 862c9f0..09269ae 100644
--- a/patches/platform_frameworks_base/0021-Switch-samsung-light-fingerprint-match-to-regexp-to-.patch
+++ b/patches/platform_frameworks_base/0023-Switch-samsung-light-fingerprint-match-to-regexp-to-.patch
@@ -1,7 +1,7 @@
-From dcd3146c380fbd14875fc8e822219d87f68a1175 Mon Sep 17 00:00:00 2001
+From 53efb21888f88be64b11ee70fef324dc8413353e Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Thu, 23 Aug 2018 23:39:16 +0200
-Subject: [PATCH 21/24] Switch samsung light fingerprint match to regexp, to
+Subject: [PATCH 23/26] Switch samsung light fingerprint match to regexp, to
include Note9
---
diff --git a/patches/platform_frameworks_base/0022-Add-a-property-toggle-to-enable-high-brightness-rang.patch b/patches/platform_frameworks_base/0024-Add-a-property-toggle-to-enable-high-brightness-rang.patch
similarity index 91%
rename from patches/platform_frameworks_base/0022-Add-a-property-toggle-to-enable-high-brightness-rang.patch
rename to patches/platform_frameworks_base/0024-Add-a-property-toggle-to-enable-high-brightness-rang.patch
index bf54218..f81e076 100644
--- a/patches/platform_frameworks_base/0022-Add-a-property-toggle-to-enable-high-brightness-rang.patch
+++ b/patches/platform_frameworks_base/0024-Add-a-property-toggle-to-enable-high-brightness-rang.patch
@@ -1,7 +1,7 @@
-From 8a822d5e7de060a39d9cce130e2620e148486434 Mon Sep 17 00:00:00 2001
+From b9e8f8e4bb881dbbe1916512fa9ddbf52e603572 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Mon, 27 Aug 2018 00:47:13 +0200
-Subject: [PATCH 22/24] Add a property toggle to enable high brightness range
+Subject: [PATCH 24/26] Add a property toggle to enable high brightness range
on samsung device
---
diff --git a/patches/platform_frameworks_base/0024-Add-japanese-S9.patch b/patches/platform_frameworks_base/0025-Add-japanese-S9.patch
similarity index 91%
rename from patches/platform_frameworks_base/0024-Add-japanese-S9.patch
rename to patches/platform_frameworks_base/0025-Add-japanese-S9.patch
index cb706c2..f7bc6c8 100644
--- a/patches/platform_frameworks_base/0024-Add-japanese-S9.patch
+++ b/patches/platform_frameworks_base/0025-Add-japanese-S9.patch
@@ -1,7 +1,7 @@
-From baca185932200c0d55df34cdbfbbf9d1c745ae33 Mon Sep 17 00:00:00 2001
+From b700f3655ef093f91cd842dc8346a1cd5d836bfb Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Tue, 28 Aug 2018 20:39:26 +0200
-Subject: [PATCH 24/24] Add japanese S9
+Subject: [PATCH 25/26] Add japanese S9
---
services/core/java/com/android/server/lights/LightsService.java | 3 ++-
diff --git a/patches/platform_frameworks_base/0026-Revert-Revert-CameraServiceProxy-Add-client-API-leve.patch b/patches/platform_frameworks_base/0026-Revert-Revert-CameraServiceProxy-Add-client-API-leve.patch
new file mode 100644
index 0000000..1a22278
--- /dev/null
+++ b/patches/platform_frameworks_base/0026-Revert-Revert-CameraServiceProxy-Add-client-API-leve.patch
@@ -0,0 +1,100 @@
+From 291679ee3ce0959101b2b905208e0275d3d463a9 Mon Sep 17 00:00:00 2001
+From: Jackeagle <jackeagle102@gmail.com>
+Date: Sat, 20 Oct 2018 12:13:12 -0400
+Subject: [PATCH 26/26] Revert "Revert "CameraServiceProxy: Add client API
+ level to log metrics""
+
+This reverts commit 7c97b7bb8b1b7f87974fcd13c1ae267288ca3e79.
+---
+ proto/src/metrics_constants.proto | 5 +++++
+ .../com/android/server/camera/CameraServiceProxy.java | 16 ++++++++++------
+ 2 files changed, 15 insertions(+), 6 deletions(-)
+
+diff --git a/proto/src/metrics_constants.proto b/proto/src/metrics_constants.proto
+index 62f9377..e568b12 100644
+--- a/proto/src/metrics_constants.proto
++++ b/proto/src/metrics_constants.proto
+@@ -5447,6 +5447,11 @@ message MetricsEvent {
+ // OS: P
+ PACKAGE_OPTIMIZATION_COMPILATION_REASON = 1321;
+
++ // FIELD: The camera API level used.
++ // CATEGORY: CAMERA
++ // OS: P
++ FIELD_CAMERA_API_LEVEL = 1322;
++
+ // OPEN: Settings > Battery > Battery tip > Battery tip Dialog
+ // CATEGORY: SETTINGS
+ // OS: P
+diff --git a/services/core/java/com/android/server/camera/CameraServiceProxy.java b/services/core/java/com/android/server/camera/CameraServiceProxy.java
+index 45d2375..0ee55ed 100644
+--- a/services/core/java/com/android/server/camera/CameraServiceProxy.java
++++ b/services/core/java/com/android/server/camera/CameraServiceProxy.java
+@@ -103,13 +103,15 @@ public class CameraServiceProxy extends SystemService
+ private static class CameraUsageEvent {
+ public final int mCameraFacing;
+ public final String mClientName;
++ public final int mAPILevel;
+
+ private boolean mCompleted;
+ private long mDurationOrStartTimeMs; // Either start time, or duration once completed
+
+- public CameraUsageEvent(int facing, String clientName) {
++ public CameraUsageEvent(int facing, String clientName, int apiLevel) {
+ mCameraFacing = facing;
+ mClientName = clientName;
++ mAPILevel = apiLevel;
+ mDurationOrStartTimeMs = SystemClock.elapsedRealtime();
+ mCompleted = false;
+ }
+@@ -173,7 +175,7 @@ public class CameraServiceProxy extends SystemService
+
+ @Override
+ public void notifyCameraState(String cameraId, int newCameraState, int facing,
+- String clientName) {
++ String clientName, int apiLevel) {
+ if (Binder.getCallingUid() != Process.CAMERASERVER_UID) {
+ Slog.e(TAG, "Calling UID: " + Binder.getCallingUid() + " doesn't match expected " +
+ " camera service UID!");
+@@ -182,9 +184,9 @@ public class CameraServiceProxy extends SystemService
+ String state = cameraStateToString(newCameraState);
+ String facingStr = cameraFacingToString(facing);
+ if (DEBUG) Slog.v(TAG, "Camera " + cameraId + " facing " + facingStr + " state now " +
+- state + " for client " + clientName);
++ state + " for client " + clientName + " API Level " + apiLevel);
+
+- updateActivityCount(cameraId, newCameraState, facing, clientName);
++ updateActivityCount(cameraId, newCameraState, facing, clientName, apiLevel);
+ }
+ };
+
+@@ -303,6 +305,7 @@ public class CameraServiceProxy extends SystemService
+ .setType(MetricsEvent.TYPE_ACTION)
+ .setSubtype(subtype)
+ .setLatency(e.getDuration())
++ .addTaggedData(MetricsEvent.FIELD_CAMERA_API_LEVEL, e.mAPILevel)
+ .setPackageName(e.mClientName);
+ mLogger.write(l);
+ }
+@@ -383,7 +386,8 @@ public class CameraServiceProxy extends SystemService
+ return true;
+ }
+
+- private void updateActivityCount(String cameraId, int newCameraState, int facing, String clientName) {
++ private void updateActivityCount(String cameraId, int newCameraState, int facing,
++ String clientName, int apiLevel) {
+ synchronized(mLock) {
+ // Update active camera list and notify NFC if necessary
+ boolean wasEmpty = mActiveCameraUsage.isEmpty();
+@@ -391,7 +395,7 @@ public class CameraServiceProxy extends SystemService
+ case ICameraServiceProxy.CAMERA_STATE_OPEN:
+ break;
+ case ICameraServiceProxy.CAMERA_STATE_ACTIVE:
+- CameraUsageEvent newEvent = new CameraUsageEvent(facing, clientName);
++ CameraUsageEvent newEvent = new CameraUsageEvent(facing, clientName, apiLevel);
+ CameraUsageEvent oldEvent = mActiveCameraUsage.put(cameraId, newEvent);
+ if (oldEvent != null) {
+ Slog.w(TAG, "Camera " + cameraId + " was already marked as active");
+--
+2.7.4
+