From 5f6d7c9b47595108b0f669862a4f381ca839683a Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Tue, 17 Oct 2023 23:44:28 +0800 Subject: [PATCH] Changes for October 2023 --- .../0001-Disable-FP-lockouts-optionally.patch | 2 +- ...0002-Disable-vendor-mismatch-warning.patch | 6 +++--- ...olors-of-slices-not-updating-on-doze.patch | 2 +- ...004-UI-Adjust-default-navbar-layouts.patch | 6 +++--- .../0005-UI-Disable-wallpaper-zoom.patch | 4 ++-- ...-and-light-dark-theme-in-user-1-icon.patch | 2 +- ...I-Increase-default-status-bar-height.patch | 2 +- .../0008-UI-Remove-QS-footer-background.patch | 2 +- ...plit-screen-divider-to-pre-Sv2-looks.patch | 2 +- ...-layout-tuning-via-sysui_nav_bar-tun.patch | 2 +- ...IXED_RATIO-for-multi-window-globally.patch | 4 ++-- ...ore-Remove-old-app-target-SDK-dialog.patch | 2 +- ...subpixel-text-positioning-by-default.patch | 2 +- ...d-support-for-app-signature-spoofing.patch | 2 +- ...roduct-name-for-Google-Play-Services.patch | 2 +- ...-Block-key-attestation-for-SafetyNet.patch | 2 +- ...-workarounds-to-unstable-GMS-process.patch | 2 +- ...the-SafetyNet-workaround-to-Play-Sto.patch | 2 +- ...xus-6P-fingerprint-for-CTS-Integrity.patch | 2 +- ...scompat-Use-actual-device-model-name.patch | 2 +- ...-shipping-level-to-32-for-devices-33.patch | 2 +- ...t-Make-CTS-Play-Integrity-pass-again.patch | 2 +- ...atch-like-behaviour-for-RRO-java-sid.patch | 20 +++++++++---------- ...sService-Alternative-backlight-scale.patch | 4 ++-- ...more-FDE-methods-from-StorageManager.patch | 10 +++++----- 25 files changed, 45 insertions(+), 45 deletions(-) diff --git a/patches_platform/frameworks_base/0001-Disable-FP-lockouts-optionally.patch b/patches_platform/frameworks_base/0001-Disable-FP-lockouts-optionally.patch index 098ff4d..a1bf18d 100644 --- a/patches_platform/frameworks_base/0001-Disable-FP-lockouts-optionally.patch +++ b/patches_platform/frameworks_base/0001-Disable-FP-lockouts-optionally.patch @@ -1,4 +1,4 @@ -From 932755113e20c93742e347b7d3908325e69e566e Mon Sep 17 00:00:00 2001 +From fdfbffda2815c0ac2270eae0efd0c31eb19e2dda Mon Sep 17 00:00:00 2001 From: AndyCGYan Date: Fri, 22 Mar 2019 00:41:20 +0800 Subject: [PATCH 01/22] Disable FP lockouts optionally diff --git a/patches_platform/frameworks_base/0002-Disable-vendor-mismatch-warning.patch b/patches_platform/frameworks_base/0002-Disable-vendor-mismatch-warning.patch index 61662f8..0e39610 100644 --- a/patches_platform/frameworks_base/0002-Disable-vendor-mismatch-warning.patch +++ b/patches_platform/frameworks_base/0002-Disable-vendor-mismatch-warning.patch @@ -1,4 +1,4 @@ -From af408d8a6a83d7a64de95ba596bda09f552fc152 Mon Sep 17 00:00:00 2001 +From f48a8e1bb482cde1c1e0a628aea218796586130a Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Thu, 5 Apr 2018 10:01:19 +0800 Subject: [PATCH 02/22] Disable vendor mismatch warning @@ -9,10 +9,10 @@ Change-Id: Ieb8fe91e2f02462f074312ed0f4885d183e9780b 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java -index 577b27b73b43..a0151468b967 100644 +index ca45e087b60c..1d1da07f2942 100644 --- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java +++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java -@@ -5869,20 +5869,8 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { +@@ -5875,20 +5875,8 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { } if (!Build.isBuildConsistent()) { diff --git a/patches_platform/frameworks_base/0003-Keyguard-Fix-colors-of-slices-not-updating-on-doze.patch b/patches_platform/frameworks_base/0003-Keyguard-Fix-colors-of-slices-not-updating-on-doze.patch index 9e964ec..3dc7144 100644 --- a/patches_platform/frameworks_base/0003-Keyguard-Fix-colors-of-slices-not-updating-on-doze.patch +++ b/patches_platform/frameworks_base/0003-Keyguard-Fix-colors-of-slices-not-updating-on-doze.patch @@ -1,4 +1,4 @@ -From ee786ac20d6586bd64839809ea16785758a5e2bf Mon Sep 17 00:00:00 2001 +From d8dea7b3e03976fa4ab292f3d6fdcae84e039196 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Tue, 17 Jan 2023 17:19:19 +0000 Subject: [PATCH 03/22] Keyguard: Fix colors of slices not updating on doze diff --git a/patches_platform/frameworks_base/0004-UI-Adjust-default-navbar-layouts.patch b/patches_platform/frameworks_base/0004-UI-Adjust-default-navbar-layouts.patch index 31dbd83..5fa58f2 100644 --- a/patches_platform/frameworks_base/0004-UI-Adjust-default-navbar-layouts.patch +++ b/patches_platform/frameworks_base/0004-UI-Adjust-default-navbar-layouts.patch @@ -1,4 +1,4 @@ -From 9ac6b32beddae19e4fd85b888f7fe8fa7ebf76c2 Mon Sep 17 00:00:00 2001 +From b92f1ca708133033601f8f0e70a872c5a30052df Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sat, 16 Oct 2021 02:23:48 +0000 Subject: [PATCH 04/22] UI: Adjust default navbar layouts @@ -45,7 +45,7 @@ index 07b797a32428..000000000000 - left[.25W],back[.5WC];home;recent[.5WC],right[.25W] - diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml -index 374cff002d29..418bbc7c7932 100644 +index 99f21ed21d15..4c386f78a27a 100644 --- a/packages/SystemUI/res/values/config.xml +++ b/packages/SystemUI/res/values/config.xml @@ -301,7 +301,7 @@ @@ -54,7 +54,7 @@ index 374cff002d29..418bbc7c7932 100644 - left[.5W],back[1WC];home;recent[1WC],right[.5W] + left[.6W],back[1WC];home;recent[1WC],right[.6W] - back[1.7WC];home;contextual[1.7WC] + back[1.7WC];home;menu_ime[1.7WC] back[70AC];home_handle;ime_switcher[70AC] -- diff --git a/patches_platform/frameworks_base/0005-UI-Disable-wallpaper-zoom.patch b/patches_platform/frameworks_base/0005-UI-Disable-wallpaper-zoom.patch index 6d22058..f40ddef 100644 --- a/patches_platform/frameworks_base/0005-UI-Disable-wallpaper-zoom.patch +++ b/patches_platform/frameworks_base/0005-UI-Disable-wallpaper-zoom.patch @@ -1,4 +1,4 @@ -From b67d11a609e9aab9ed8d36525815c5edf127a3e2 Mon Sep 17 00:00:00 2001 +From 09662a87b7db9b520aa5f996c5b837717fadfdec Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sun, 10 Jan 2021 11:44:29 +0000 Subject: [PATCH 05/22] UI: Disable wallpaper zoom @@ -11,7 +11,7 @@ Change-Id: I78cc5484930b27f172cd8d8a5bd9042dce3478d0 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml -index f5ed2e508411..1bfb2da64706 100644 +index f015b485dfa6..77045ea11775 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -5206,7 +5206,7 @@ diff --git a/patches_platform/frameworks_base/0006-UI-Follow-Monet-and-light-dark-theme-in-user-1-icon.patch b/patches_platform/frameworks_base/0006-UI-Follow-Monet-and-light-dark-theme-in-user-1-icon.patch index fcb3e69..07db1ac 100644 --- a/patches_platform/frameworks_base/0006-UI-Follow-Monet-and-light-dark-theme-in-user-1-icon.patch +++ b/patches_platform/frameworks_base/0006-UI-Follow-Monet-and-light-dark-theme-in-user-1-icon.patch @@ -1,4 +1,4 @@ -From 747de8e3300b9fc52d9b3e0d3bf94dca7e4a0367 Mon Sep 17 00:00:00 2001 +From 6662339ff0a5507899d0f8bca883dbef8f748f1b Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sun, 25 Sep 2022 02:20:52 +0000 Subject: [PATCH 06/22] UI: Follow Monet and light/dark theme in user 1 icon diff --git a/patches_platform/frameworks_base/0007-UI-Increase-default-status-bar-height.patch b/patches_platform/frameworks_base/0007-UI-Increase-default-status-bar-height.patch index bfad25f..cf35cf1 100644 --- a/patches_platform/frameworks_base/0007-UI-Increase-default-status-bar-height.patch +++ b/patches_platform/frameworks_base/0007-UI-Increase-default-status-bar-height.patch @@ -1,4 +1,4 @@ -From 334cc0e109bbe9bce5682c8b398131543099c044 Mon Sep 17 00:00:00 2001 +From 2249465d16cea6251df69dd13d331ed2fae270f0 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Wed, 3 Jun 2020 01:31:34 +0000 Subject: [PATCH 07/22] UI: Increase default status bar height diff --git a/patches_platform/frameworks_base/0008-UI-Remove-QS-footer-background.patch b/patches_platform/frameworks_base/0008-UI-Remove-QS-footer-background.patch index 3d85b63..5b2325a 100644 --- a/patches_platform/frameworks_base/0008-UI-Remove-QS-footer-background.patch +++ b/patches_platform/frameworks_base/0008-UI-Remove-QS-footer-background.patch @@ -1,4 +1,4 @@ -From c4cad43dbcbbfc0f1d86e8c7803282db738e48ed Mon Sep 17 00:00:00 2001 +From 380d8dff252dcde3b490cc3080bd56d2e3d21ec4 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sun, 25 Sep 2022 02:20:20 +0000 Subject: [PATCH 08/22] UI: Remove QS footer background diff --git a/patches_platform/frameworks_base/0009-UI-Restore-split-screen-divider-to-pre-Sv2-looks.patch b/patches_platform/frameworks_base/0009-UI-Restore-split-screen-divider-to-pre-Sv2-looks.patch index a34d795..4720d39 100644 --- a/patches_platform/frameworks_base/0009-UI-Restore-split-screen-divider-to-pre-Sv2-looks.patch +++ b/patches_platform/frameworks_base/0009-UI-Restore-split-screen-divider-to-pre-Sv2-looks.patch @@ -1,4 +1,4 @@ -From d2185c0d7ed8a388f3ec6a0d9b02dbbd02578b0b Mon Sep 17 00:00:00 2001 +From 9f047b03021034b2cb21e7b8c2845eb8dfd577d1 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sat, 19 Mar 2022 09:22:24 +0000 Subject: [PATCH 09/22] UI: Restore split-screen divider to pre-Sv2 looks diff --git a/patches_platform/frameworks_base/0010-UI-Revive-navbar-layout-tuning-via-sysui_nav_bar-tun.patch b/patches_platform/frameworks_base/0010-UI-Revive-navbar-layout-tuning-via-sysui_nav_bar-tun.patch index 6ec84ce..eef8855 100644 --- a/patches_platform/frameworks_base/0010-UI-Revive-navbar-layout-tuning-via-sysui_nav_bar-tun.patch +++ b/patches_platform/frameworks_base/0010-UI-Revive-navbar-layout-tuning-via-sysui_nav_bar-tun.patch @@ -1,4 +1,4 @@ -From 37b6af802239f74fff078dc30576b01f43b64398 Mon Sep 17 00:00:00 2001 +From 31f4647fa3e8662e372a3dacb08a64765f29915f Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Tue, 6 Oct 2020 01:41:16 +0000 Subject: [PATCH 10/22] UI: Revive navbar layout tuning via sysui_nav_bar diff --git a/patches_platform/frameworks_base/0011-UI-Use-SNAP_FIXED_RATIO-for-multi-window-globally.patch b/patches_platform/frameworks_base/0011-UI-Use-SNAP_FIXED_RATIO-for-multi-window-globally.patch index 81f1349..4d8c5f6 100644 --- a/patches_platform/frameworks_base/0011-UI-Use-SNAP_FIXED_RATIO-for-multi-window-globally.patch +++ b/patches_platform/frameworks_base/0011-UI-Use-SNAP_FIXED_RATIO-for-multi-window-globally.patch @@ -1,4 +1,4 @@ -From b5361204a9dd891c17bbca6934aaa78142a3db28 Mon Sep 17 00:00:00 2001 +From d81745ad081c1e8bbabd346deb3fa5cb3b3a1017 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sun, 26 Apr 2020 08:56:13 +0000 Subject: [PATCH 11/22] UI: Use SNAP_FIXED_RATIO for multi-window globally @@ -78,7 +78,7 @@ index 34b6a54be493..3921c9edfeac 100644 Only applies if the device display is not square. --> false diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml -index 1bfb2da64706..d1bbfb748379 100644 +index 77045ea11775..5c9cad656654 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -3885,7 +3885,7 @@ diff --git a/patches_platform/frameworks_base/0012-core-Remove-old-app-target-SDK-dialog.patch b/patches_platform/frameworks_base/0012-core-Remove-old-app-target-SDK-dialog.patch index 4944ea6..2ae22ba 100644 --- a/patches_platform/frameworks_base/0012-core-Remove-old-app-target-SDK-dialog.patch +++ b/patches_platform/frameworks_base/0012-core-Remove-old-app-target-SDK-dialog.patch @@ -1,4 +1,4 @@ -From 0dc8c35dd5476c2dd0b688a47c3aa330bc0386c5 Mon Sep 17 00:00:00 2001 +From a1b87f1cc52bd1d906554b94657634976b9fb776 Mon Sep 17 00:00:00 2001 From: Danny Lin Date: Tue, 3 Nov 2020 22:43:12 -0800 Subject: [PATCH 12/22] core: Remove old app target SDK dialog diff --git a/patches_platform/frameworks_base/0013-Paint-Enable-subpixel-text-positioning-by-default.patch b/patches_platform/frameworks_base/0013-Paint-Enable-subpixel-text-positioning-by-default.patch index 49649a8..3757baf 100644 --- a/patches_platform/frameworks_base/0013-Paint-Enable-subpixel-text-positioning-by-default.patch +++ b/patches_platform/frameworks_base/0013-Paint-Enable-subpixel-text-positioning-by-default.patch @@ -1,4 +1,4 @@ -From 64d61661bba53aec63b25038b66dc930f0059f8a Mon Sep 17 00:00:00 2001 +From 8b17b1dc3b1f373a0ae8a44d16a8adec599915b3 Mon Sep 17 00:00:00 2001 From: Danny Lin Date: Tue, 5 Oct 2021 21:01:50 -0700 Subject: [PATCH 13/22] Paint: Enable subpixel text positioning by default diff --git a/patches_platform/frameworks_base/0014-Add-support-for-app-signature-spoofing.patch b/patches_platform/frameworks_base/0014-Add-support-for-app-signature-spoofing.patch index 6333fa2..2d28285 100644 --- a/patches_platform/frameworks_base/0014-Add-support-for-app-signature-spoofing.patch +++ b/patches_platform/frameworks_base/0014-Add-support-for-app-signature-spoofing.patch @@ -1,4 +1,4 @@ -From 68072a29530a1e6a2274f3ec1422aaceb180b334 Mon Sep 17 00:00:00 2001 +From 482d15491c36aeb11a0e8b5c9a5205d389507034 Mon Sep 17 00:00:00 2001 From: Danny Lin Date: Sat, 16 Oct 2021 05:27:57 -0700 Subject: [PATCH 14/22] Add support for app signature spoofing diff --git a/patches_platform/frameworks_base/0015-Spoof-product-name-for-Google-Play-Services.patch b/patches_platform/frameworks_base/0015-Spoof-product-name-for-Google-Play-Services.patch index 0ca6f92..0f899d7 100644 --- a/patches_platform/frameworks_base/0015-Spoof-product-name-for-Google-Play-Services.patch +++ b/patches_platform/frameworks_base/0015-Spoof-product-name-for-Google-Play-Services.patch @@ -1,4 +1,4 @@ -From a2924f660008f6400621d012d037ef2107341a76 Mon Sep 17 00:00:00 2001 +From db27d27f48658841c6a74e55f543f417ddb16e76 Mon Sep 17 00:00:00 2001 From: Danny Lin Date: Mon, 11 Oct 2021 19:59:51 -0700 Subject: [PATCH 15/22] Spoof product name for Google Play Services diff --git a/patches_platform/frameworks_base/0016-keystore-Block-key-attestation-for-SafetyNet.patch b/patches_platform/frameworks_base/0016-keystore-Block-key-attestation-for-SafetyNet.patch index 75b7a2e..c0ecee3 100644 --- a/patches_platform/frameworks_base/0016-keystore-Block-key-attestation-for-SafetyNet.patch +++ b/patches_platform/frameworks_base/0016-keystore-Block-key-attestation-for-SafetyNet.patch @@ -1,4 +1,4 @@ -From c5b11c6240de3e08613a80791866549c624cf2f7 Mon Sep 17 00:00:00 2001 +From dc4bd0f140c6946e01e0a3c31bfc71c884138981 Mon Sep 17 00:00:00 2001 From: Danny Lin Date: Mon, 11 Oct 2021 20:00:44 -0700 Subject: [PATCH 16/22] keystore: Block key attestation for SafetyNet diff --git a/patches_platform/frameworks_base/0017-Limit-SafetyNet-workarounds-to-unstable-GMS-process.patch b/patches_platform/frameworks_base/0017-Limit-SafetyNet-workarounds-to-unstable-GMS-process.patch index 38661ff..16c38c4 100644 --- a/patches_platform/frameworks_base/0017-Limit-SafetyNet-workarounds-to-unstable-GMS-process.patch +++ b/patches_platform/frameworks_base/0017-Limit-SafetyNet-workarounds-to-unstable-GMS-process.patch @@ -1,4 +1,4 @@ -From f3163fabeb398df4f1a3e44c79c5d66d7d567754 Mon Sep 17 00:00:00 2001 +From 05bc5fa10b4e2ebc539c32db04abbc995906ff05 Mon Sep 17 00:00:00 2001 From: Danny Lin Date: Mon, 1 Nov 2021 20:06:48 -0700 Subject: [PATCH 17/22] Limit SafetyNet workarounds to unstable GMS process diff --git a/patches_platform/frameworks_base/0018-gmscompat-Apply-the-SafetyNet-workaround-to-Play-Sto.patch b/patches_platform/frameworks_base/0018-gmscompat-Apply-the-SafetyNet-workaround-to-Play-Sto.patch index 47e06f5..85b3683 100644 --- a/patches_platform/frameworks_base/0018-gmscompat-Apply-the-SafetyNet-workaround-to-Play-Sto.patch +++ b/patches_platform/frameworks_base/0018-gmscompat-Apply-the-SafetyNet-workaround-to-Play-Sto.patch @@ -1,4 +1,4 @@ -From 0f190aa490eac609ae6331092863c8c209cb150b Mon Sep 17 00:00:00 2001 +From ace6036332743c6f1a5614b2fd573464ddbffef7 Mon Sep 17 00:00:00 2001 From: Dyneteve Date: Tue, 23 Aug 2022 18:57:05 +0200 Subject: [PATCH 18/22] gmscompat: Apply the SafetyNet workaround to Play Store diff --git a/patches_platform/frameworks_base/0019-gmscompat-Use-Nexus-6P-fingerprint-for-CTS-Integrity.patch b/patches_platform/frameworks_base/0019-gmscompat-Use-Nexus-6P-fingerprint-for-CTS-Integrity.patch index 903ffd4..505891f 100644 --- a/patches_platform/frameworks_base/0019-gmscompat-Use-Nexus-6P-fingerprint-for-CTS-Integrity.patch +++ b/patches_platform/frameworks_base/0019-gmscompat-Use-Nexus-6P-fingerprint-for-CTS-Integrity.patch @@ -1,4 +1,4 @@ -From 786a25e8bceba2a165945905b102b2d883e2c63b Mon Sep 17 00:00:00 2001 +From d67897a23c6e182294d6a6d137d7ccc430a1abe0 Mon Sep 17 00:00:00 2001 From: Dyneteve Date: Thu, 8 Sep 2022 14:39:52 +0200 Subject: [PATCH 19/22] gmscompat: Use Nexus 6P fingerprint for CTS/Integrity diff --git a/patches_platform/frameworks_base/0020-gmscompat-Use-actual-device-model-name.patch b/patches_platform/frameworks_base/0020-gmscompat-Use-actual-device-model-name.patch index f92cd5d..50ddf75 100644 --- a/patches_platform/frameworks_base/0020-gmscompat-Use-actual-device-model-name.patch +++ b/patches_platform/frameworks_base/0020-gmscompat-Use-actual-device-model-name.patch @@ -1,4 +1,4 @@ -From 651f1b866834ee07ee6560469fcbd5e59a105c8a Mon Sep 17 00:00:00 2001 +From 7893f246007a1989420583ab8728a5ced89e944d Mon Sep 17 00:00:00 2001 From: Dyneteve Date: Tue, 6 Dec 2022 15:59:08 +0100 Subject: [PATCH 20/22] gmscompat: Use actual device model name diff --git a/patches_platform/frameworks_base/0021-gmscompat-Set-shipping-level-to-32-for-devices-33.patch b/patches_platform/frameworks_base/0021-gmscompat-Set-shipping-level-to-32-for-devices-33.patch index 23b2674..680ab45 100644 --- a/patches_platform/frameworks_base/0021-gmscompat-Set-shipping-level-to-32-for-devices-33.patch +++ b/patches_platform/frameworks_base/0021-gmscompat-Set-shipping-level-to-32-for-devices-33.patch @@ -1,4 +1,4 @@ -From 2010137112b9a768bf766e3eb7bc4f084a4b7b28 Mon Sep 17 00:00:00 2001 +From dd5e4484df6868958941773ac310396b281e5ceb Mon Sep 17 00:00:00 2001 From: Anirudh Gupta Date: Wed, 4 Jan 2023 18:20:56 +0000 Subject: [PATCH 21/22] gmscompat: Set shipping level to 32 for devices >=33 diff --git a/patches_platform/frameworks_base/0022-gmscompat-Make-CTS-Play-Integrity-pass-again.patch b/patches_platform/frameworks_base/0022-gmscompat-Make-CTS-Play-Integrity-pass-again.patch index 2f94dc0..bac04c2 100644 --- a/patches_platform/frameworks_base/0022-gmscompat-Make-CTS-Play-Integrity-pass-again.patch +++ b/patches_platform/frameworks_base/0022-gmscompat-Make-CTS-Play-Integrity-pass-again.patch @@ -1,4 +1,4 @@ -From eefc48647852fc2ced0ff413c9a40fa14b00e92c Mon Sep 17 00:00:00 2001 +From 4ffed064b21d9662631ee70d20dfd8441fcec574 Mon Sep 17 00:00:00 2001 From: Dyneteve Date: Wed, 8 Feb 2023 15:21:01 +0000 Subject: [PATCH 22/22] gmscompat: Make CTS/Play Integrity pass again diff --git a/patches_treble/frameworks_base/0001-Re-implement-fnmatch-like-behaviour-for-RRO-java-sid.patch b/patches_treble/frameworks_base/0001-Re-implement-fnmatch-like-behaviour-for-RRO-java-sid.patch index 1e5cdf8..83b45aa 100644 --- a/patches_treble/frameworks_base/0001-Re-implement-fnmatch-like-behaviour-for-RRO-java-sid.patch +++ b/patches_treble/frameworks_base/0001-Re-implement-fnmatch-like-behaviour-for-RRO-java-sid.patch @@ -1,4 +1,4 @@ -From 1891dacd48c4d502666fb4468582c088e4c0c097 Mon Sep 17 00:00:00 2001 +From 5cd85c5a58621bd1365a22f7dad6f3d8ede2c194 Mon Sep 17 00:00:00 2001 From: Pierre-Hugues Husson Date: Sun, 25 Oct 2020 23:57:26 +0100 Subject: [PATCH 1/3] Re-implement fnmatch-like behaviour for RRO java-side @@ -12,10 +12,10 @@ Change-Id: Id38292a9a1453aa87b8401c1fdb390fa4e63c7d1 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java -index 995092117f4d..28efda00393d 100644 +index c01e30ded50e..db6a36ee1b66 100644 --- a/core/java/android/content/pm/PackageParser.java +++ b/core/java/android/content/pm/PackageParser.java -@@ -2544,8 +2544,17 @@ public class PackageParser { +@@ -2554,8 +2554,17 @@ public class PackageParser { for (int i = 0; i < propNames.length; i++) { // Check property value: make sure it is both set and equal to expected value final String currValue = SystemProperties.get(propNames[i]); @@ -36,14 +36,14 @@ index 995092117f4d..28efda00393d 100644 } return true; diff --git a/core/java/android/content/pm/parsing/FrameworkParsingPackageUtils.java b/core/java/android/content/pm/parsing/FrameworkParsingPackageUtils.java -index 3e1c5bb3d7ec..8182e9e0c771 100644 +index b75ba82ad091..b344f7232190 100644 --- a/core/java/android/content/pm/parsing/FrameworkParsingPackageUtils.java +++ b/core/java/android/content/pm/parsing/FrameworkParsingPackageUtils.java -@@ -215,8 +215,17 @@ public class FrameworkParsingPackageUtils { - for (int i = 0; i < propNames.length; i++) { - // Check property value: make sure it is both set and equal to expected value - final String currValue = SystemProperties.get(propNames[i]); -- if (!TextUtils.equals(currValue, propValues[i])) { +@@ -223,8 +223,17 @@ public class FrameworkParsingPackageUtils { + continue; + } + // 3. Check if prop is equal to expected value. +- if (!currValue.equals(propValues[i])) { - return false; + final String value = propValues[i]; + if(value.startsWith("+")) { @@ -60,5 +60,5 @@ index 3e1c5bb3d7ec..8182e9e0c771 100644 } return true; -- -2.25.1 +2.34.1 diff --git a/patches_treble/frameworks_base/0002-LightsService-Alternative-backlight-scale.patch b/patches_treble/frameworks_base/0002-LightsService-Alternative-backlight-scale.patch index 9a6d5f0..d8402e2 100644 --- a/patches_treble/frameworks_base/0002-LightsService-Alternative-backlight-scale.patch +++ b/patches_treble/frameworks_base/0002-LightsService-Alternative-backlight-scale.patch @@ -1,4 +1,4 @@ -From b0333760d4370e63470fc61bece55e29f16a9eaf Mon Sep 17 00:00:00 2001 +From eca6f07922f3804f6f1844f067941fc8097459c5 Mon Sep 17 00:00:00 2001 From: Pierre-Hugues Husson Date: Sat, 24 Mar 2018 08:01:48 +0100 Subject: [PATCH 2/3] LightsService: Alternative backlight scale @@ -42,5 +42,5 @@ index fea6b29d9260..2a9a3b63ea2e 100644 color = 0xff000000 | (color << 16) | (color << 8) | color; setLightLocked(color, LIGHT_FLASH_NONE, 0, 0, brightnessMode); -- -2.25.1 +2.34.1 diff --git a/patches_treble/frameworks_base/0003-Revert-Remove-more-FDE-methods-from-StorageManager.patch b/patches_treble/frameworks_base/0003-Revert-Remove-more-FDE-methods-from-StorageManager.patch index 171d053..c6969cc 100644 --- a/patches_treble/frameworks_base/0003-Revert-Remove-more-FDE-methods-from-StorageManager.patch +++ b/patches_treble/frameworks_base/0003-Revert-Remove-more-FDE-methods-from-StorageManager.patch @@ -1,4 +1,4 @@ -From f962ed979393abb8297e790b452739a8eec9c76c Mon Sep 17 00:00:00 2001 +From 2bee84fb2e576ffb56d8ad428ba180aee67d2d8c Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sat, 15 Oct 2022 09:33:56 +0000 Subject: [PATCH 3/3] Revert "Remove more FDE methods from StorageManager" @@ -10,7 +10,7 @@ This reverts commit bd13f84152449a3ead6fa8604fd31f48c0224676. 2 files changed, 65 insertions(+), 8 deletions(-) diff --git a/core/java/android/os/storage/StorageManager.java b/core/java/android/os/storage/StorageManager.java -index 497bfa6380bc..646a7095c1b3 100644 +index d9604b3f0145..603612e82007 100644 --- a/core/java/android/os/storage/StorageManager.java +++ b/core/java/android/os/storage/StorageManager.java @@ -1681,13 +1681,18 @@ public class StorageManager { @@ -104,10 +104,10 @@ index 497bfa6380bc..646a7095c1b3 100644 public static boolean isFileEncryptedEmulatedOnly() { return SystemProperties.getBoolean(StorageManager.PROP_EMULATE_FBE, false); diff --git a/core/java/com/android/internal/os/RoSystemProperties.java b/core/java/com/android/internal/os/RoSystemProperties.java -index 98d81c9598b8..8b659f927633 100644 +index cccd80e82420..adb5c107bc62 100644 --- a/core/java/com/android/internal/os/RoSystemProperties.java +++ b/core/java/com/android/internal/os/RoSystemProperties.java -@@ -60,10 +60,14 @@ public class RoSystemProperties { +@@ -62,10 +62,14 @@ public class RoSystemProperties { public static final CryptoProperties.type_values CRYPTO_TYPE = CryptoProperties.type().orElse(CryptoProperties.type_values.NONE); // These are pseudo-properties @@ -123,5 +123,5 @@ index 98d81c9598b8..8b659f927633 100644 public static final boolean CONTROL_PRIVAPP_PERMISSIONS_LOG = "log".equalsIgnoreCase(CONTROL_PRIVAPP_PERMISSIONS); -- -2.25.1 +2.34.1