diff --git a/patches_platform/frameworks_base/0001-Add-SPenPointerOverlay.patch b/patches_platform/frameworks_base/0001-Add-SPenPointerOverlay.patch deleted file mode 100644 index d4c1051..0000000 --- a/patches_platform/frameworks_base/0001-Add-SPenPointerOverlay.patch +++ /dev/null @@ -1,126 +0,0 @@ -From d2d9150fee51378f34efff4ba7f50a194bb85064 Mon Sep 17 00:00:00 2001 -From: Andy CrossGate Yan -Date: Thu, 13 Jan 2022 14:22:24 +0000 -Subject: [PATCH 01/23] Add SPenPointerOverlay - -Toggle this overlay with property "persist.ui.spen.pointer" - -Change-Id: I21f7e05cf8ebd74c950dfb20cf7eee99bfe22988 ---- - packages/overlays/Android.mk | 1 + - .../overlays/SPenPointerOverlay/Android.bp | 28 ++++++++++++++++++ - .../SPenPointerOverlay/AndroidManifest.xml | 23 ++++++++++++++ - .../sem_pointer_spot_hovering_spen.png | Bin 0 -> 411 bytes - .../res/drawable/pointer_arrow_icon.xml | 5 ++++ - 5 files changed, 57 insertions(+) - create mode 100644 packages/overlays/SPenPointerOverlay/Android.bp - create mode 100644 packages/overlays/SPenPointerOverlay/AndroidManifest.xml - create mode 100644 packages/overlays/SPenPointerOverlay/res/drawable-xxhdpi/sem_pointer_spot_hovering_spen.png - create mode 100644 packages/overlays/SPenPointerOverlay/res/drawable/pointer_arrow_icon.xml - -diff --git a/packages/overlays/Android.mk b/packages/overlays/Android.mk -index 69641e69a9f2..36ec11af3068 100644 ---- a/packages/overlays/Android.mk -+++ b/packages/overlays/Android.mk -@@ -31,6 +31,7 @@ LOCAL_REQUIRED_MODULES := \ - NavigationBarModeGesturalOverlayNarrowBack \ - NavigationBarModeGesturalOverlayWideBack \ - NavigationBarModeGesturalOverlayExtraWideBack \ -+ SPenPointerOverlay \ - preinstalled-packages-platform-overlays.xml - - include $(BUILD_PHONY_PACKAGE) -diff --git a/packages/overlays/SPenPointerOverlay/Android.bp b/packages/overlays/SPenPointerOverlay/Android.bp -new file mode 100644 -index 000000000000..7632ebd43ef6 ---- /dev/null -+++ b/packages/overlays/SPenPointerOverlay/Android.bp -@@ -0,0 +1,28 @@ -+// -+// Copyright 2021, The Android Open Source Project -+// -+// Licensed under the Apache License, Version 2.0 (the "License"); -+// you may not use this file except in compliance with the License. -+// You may obtain a copy of the License at -+// -+// http://www.apache.org/licenses/LICENSE-2.0 -+// -+// Unless required by applicable law or agreed to in writing, software -+// distributed under the License is distributed on an "AS IS" BASIS, -+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+// See the License for the specific language governing permissions and -+// limitations under the License. -+// -+package { -+ // See: http://go/android-license-faq -+ // A large-scale-change added 'default_applicable_licenses' to import -+ // all of the 'license_kinds' from "frameworks_base_license" -+ // to get the below license kinds: -+ // SPDX-license-identifier-Apache-2.0 -+ default_applicable_licenses: ["frameworks_base_license"], -+} -+ -+runtime_resource_overlay { -+ name: "SPenPointerOverlay", -+ product_specific: true, -+} -diff --git a/packages/overlays/SPenPointerOverlay/AndroidManifest.xml b/packages/overlays/SPenPointerOverlay/AndroidManifest.xml -new file mode 100644 -index 000000000000..b785214f854b ---- /dev/null -+++ b/packages/overlays/SPenPointerOverlay/AndroidManifest.xml -@@ -0,0 +1,23 @@ -+ -+ -+ -+ -+ -diff --git a/packages/overlays/SPenPointerOverlay/res/drawable-xxhdpi/sem_pointer_spot_hovering_spen.png b/packages/overlays/SPenPointerOverlay/res/drawable-xxhdpi/sem_pointer_spot_hovering_spen.png -new file mode 100644 -index 0000000000000000000000000000000000000000..b73246c80a95e0bceeb8c09aacd2653722fca2d2 -GIT binary patch -literal 411 -zcmeAS@N?(olHy`uVBq!ia0vp^av;pX3?zBp#Z3TG?EyX^u0VPYDww}y>9XB>H{O1* -z{q+Z+%%XMcH{QCp_4%7Ek6&zi^&Z52_8N#bKYY6T$G`bYmOylGdHNEl2EyKW`#w-H -zMEkav?|=xXa@&iyKv|#(o9;XSGJv*hefA2d9ViRrHpmHroTOV4wkZ<5N -zBf!g`Yhiojq)$5MjpwPIIqY#_(VA78COitTt~#=3 -+ --- -2.34.1 - diff --git a/patches_platform/frameworks_base/0001-Check-null-FingerprintManager-first-in-onStartedWaki.patch b/patches_platform/frameworks_base/0001-Check-null-FingerprintManager-first-in-onStartedWaki.patch new file mode 100644 index 0000000..14e1a40 --- /dev/null +++ b/patches_platform/frameworks_base/0001-Check-null-FingerprintManager-first-in-onStartedWaki.patch @@ -0,0 +1,28 @@ +From 9fb18df98c435af869b08b4796e45b9b8fe8c7cf Mon Sep 17 00:00:00 2001 +From: Andy CrossGate Yan +Date: Sun, 18 Jun 2023 19:56:36 +0800 +Subject: [PATCH 01/23] Check null FingerprintManager first in + onStartedWakingUp + +Fixes crashing when unlocking from AOD + +Change-Id: I80423b14bbe54989fb9a561271e84988e7427209 +--- + .../android/systemui/statusbar/phone/CentralSurfacesImpl.java | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java +index ec8a7a4ffdd3..5462cfdebef4 100644 +--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java ++++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java +@@ -3587,6 +3587,7 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces, Tune + && mStatusBarStateController.getDozeAmount() == 1f + && mWakefulnessLifecycle.getLastWakeReason() + == PowerManager.WAKE_REASON_POWER_BUTTON ++ && mFingerprintManager.get() != null + && mFingerprintManager.get().isPowerbuttonFps() + && mFingerprintManager.get().hasEnrolledFingerprints() + && !touchToUnlockAnytime; +-- +2.34.1 + diff --git a/patches_platform/frameworks_base/0002-Disable-FP-lockouts-optionally.patch b/patches_platform/frameworks_base/0002-Disable-FP-lockouts-optionally.patch index 56972eb..cb23f52 100644 --- a/patches_platform/frameworks_base/0002-Disable-FP-lockouts-optionally.patch +++ b/patches_platform/frameworks_base/0002-Disable-FP-lockouts-optionally.patch @@ -1,4 +1,4 @@ -From 80b9721f6e8da1f45ca5ebff8870f235efcb2c1e Mon Sep 17 00:00:00 2001 +From ecfa5198eff7f7ce4276cd11469f53bd7aabe8ca Mon Sep 17 00:00:00 2001 From: AndyCGYan Date: Fri, 22 Mar 2019 00:41:20 +0800 Subject: [PATCH 02/23] Disable FP lockouts optionally diff --git a/patches_platform/frameworks_base/0003-Disable-vendor-mismatch-warning.patch b/patches_platform/frameworks_base/0003-Disable-vendor-mismatch-warning.patch index 3c4c0a0..38f0d2d 100644 --- a/patches_platform/frameworks_base/0003-Disable-vendor-mismatch-warning.patch +++ b/patches_platform/frameworks_base/0003-Disable-vendor-mismatch-warning.patch @@ -1,4 +1,4 @@ -From 908593ecda65f87bbcbda662f9e35de0d7ba94f4 Mon Sep 17 00:00:00 2001 +From 42a0b3f0599704873de0ac0aca2c1e67adc18c26 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Thu, 5 Apr 2018 10:01:19 +0800 Subject: [PATCH 03/23] 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 3e1b30b2ff25..8681bd726f3b 100644 +index 577b27b73b43..a0151468b967 100644 --- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java +++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java -@@ -5859,20 +5859,8 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { +@@ -5869,20 +5869,8 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { } if (!Build.isBuildConsistent()) { diff --git a/patches_platform/frameworks_base/0004-Keyguard-Fix-colors-of-slices-not-updating-on-doze.patch b/patches_platform/frameworks_base/0004-Keyguard-Fix-colors-of-slices-not-updating-on-doze.patch index c7503f5..59fd332 100644 --- a/patches_platform/frameworks_base/0004-Keyguard-Fix-colors-of-slices-not-updating-on-doze.patch +++ b/patches_platform/frameworks_base/0004-Keyguard-Fix-colors-of-slices-not-updating-on-doze.patch @@ -1,4 +1,4 @@ -From e08d2afd0c6663e9d439b9371d9aba20f3e566e5 Mon Sep 17 00:00:00 2001 +From 5be23474b8d72aa5111e78718272f23a31422295 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Tue, 17 Jan 2023 17:19:19 +0000 Subject: [PATCH 04/23] Keyguard: Fix colors of slices not updating on doze @@ -13,10 +13,10 @@ Change-Id: I06abd8bf2e28655cc9e6d81366fd82a13454ec5a 2 files changed, 8 insertions(+) diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardStatusViewController.java b/packages/SystemUI/src/com/android/keyguard/KeyguardStatusViewController.java -index aec30632c41e..7ef624a6f184 100644 +index f4c581552bc4..c0f983551877 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardStatusViewController.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardStatusViewController.java -@@ -99,6 +99,13 @@ public class KeyguardStatusViewController extends ViewController Date: Sat, 16 Oct 2021 02:23:48 +0000 Subject: [PATCH 05/23] 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 48c35ae8789d..70269b18a573 100644 +index 374cff002d29..418bbc7c7932 100644 --- a/packages/SystemUI/res/values/config.xml +++ b/packages/SystemUI/res/values/config.xml @@ -301,7 +301,7 @@ diff --git a/patches_platform/frameworks_base/0006-UI-Disable-wallpaper-zoom.patch b/patches_platform/frameworks_base/0006-UI-Disable-wallpaper-zoom.patch index e87a532..a93502d 100644 --- a/patches_platform/frameworks_base/0006-UI-Disable-wallpaper-zoom.patch +++ b/patches_platform/frameworks_base/0006-UI-Disable-wallpaper-zoom.patch @@ -1,4 +1,4 @@ -From 4bb9def8e58fa46890cdf93672e35a298bd595ff Mon Sep 17 00:00:00 2001 +From 649ce048d4f01ac4ed24ede16f7e7f185cdb1f67 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sun, 10 Jan 2021 11:44:29 +0000 Subject: [PATCH 06/23] UI: Disable wallpaper zoom @@ -11,10 +11,10 @@ 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 987426f56463..c2e2c91b2829 100644 +index 91dd9179c329..75941bbb8cd3 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml -@@ -5146,7 +5146,7 @@ +@@ -5203,7 +5203,7 @@ 1 diff --git a/patches_platform/frameworks_base/0007-UI-Follow-Monet-and-light-dark-theme-in-user-1-icon.patch b/patches_platform/frameworks_base/0007-UI-Follow-Monet-and-light-dark-theme-in-user-1-icon.patch index 7d033f8..091edb3 100644 --- a/patches_platform/frameworks_base/0007-UI-Follow-Monet-and-light-dark-theme-in-user-1-icon.patch +++ b/patches_platform/frameworks_base/0007-UI-Follow-Monet-and-light-dark-theme-in-user-1-icon.patch @@ -1,4 +1,4 @@ -From f439b01c40e9c9af40b40dfb80f7422775c587d6 Mon Sep 17 00:00:00 2001 +From 4766c45fdd4cf28209445a209fab52b4d09f057d Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sun, 25 Sep 2022 02:20:52 +0000 Subject: [PATCH 07/23] UI: Follow Monet and light/dark theme in user 1 icon @@ -22,10 +22,10 @@ index ffaccd3ddc57..e2a955b89c77 100644 #ff4ecde6 #fffbbc04 diff --git a/core/res/res/values/colors.xml b/core/res/res/values/colors.xml -index d5875f547e91..c7711ed3e493 100644 +index b83d3b4ea298..7586684ea936 100644 --- a/core/res/res/values/colors.xml +++ b/core/res/res/values/colors.xml -@@ -174,7 +174,7 @@ +@@ -176,7 +176,7 @@ #00000000 diff --git a/patches_platform/frameworks_base/0008-UI-Increase-default-status-bar-height.patch b/patches_platform/frameworks_base/0008-UI-Increase-default-status-bar-height.patch index 1561be6..d54017f 100644 --- a/patches_platform/frameworks_base/0008-UI-Increase-default-status-bar-height.patch +++ b/patches_platform/frameworks_base/0008-UI-Increase-default-status-bar-height.patch @@ -1,4 +1,4 @@ -From 8f0163c65d95e9ecfb4eb3e573040d22c9693ebb Mon Sep 17 00:00:00 2001 +From 22415704f766f87342d2fe61ac17d485263d8fb9 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Wed, 3 Jun 2020 01:31:34 +0000 Subject: [PATCH 08/23] UI: Increase default status bar height diff --git a/patches_platform/frameworks_base/0009-UI-Remove-QS-footer-background.patch b/patches_platform/frameworks_base/0009-UI-Remove-QS-footer-background.patch index fe13a66..8e0c88c 100644 --- a/patches_platform/frameworks_base/0009-UI-Remove-QS-footer-background.patch +++ b/patches_platform/frameworks_base/0009-UI-Remove-QS-footer-background.patch @@ -1,4 +1,4 @@ -From e3ad3c7f7bbdb5913feddced1a1a36652d849f9d Mon Sep 17 00:00:00 2001 +From 01a3d9b6958a779bad976d07c38b06f518178072 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sun, 25 Sep 2022 02:20:20 +0000 Subject: [PATCH 09/23] UI: Remove QS footer background diff --git a/patches_platform/frameworks_base/0010-UI-Restore-split-screen-divider-to-pre-Sv2-looks.patch b/patches_platform/frameworks_base/0010-UI-Restore-split-screen-divider-to-pre-Sv2-looks.patch index 820de30..fb87d32 100644 --- a/patches_platform/frameworks_base/0010-UI-Restore-split-screen-divider-to-pre-Sv2-looks.patch +++ b/patches_platform/frameworks_base/0010-UI-Restore-split-screen-divider-to-pre-Sv2-looks.patch @@ -1,4 +1,4 @@ -From 4a51c5c42de7b550ce9a13322d63c44a8bbd76d8 Mon Sep 17 00:00:00 2001 +From 15e2a02275c1de3c194f18079b12bb3220afb862 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sat, 19 Mar 2022 09:22:24 +0000 Subject: [PATCH 10/23] UI: Restore split-screen divider to pre-Sv2 looks @@ -8,28 +8,57 @@ Subject: [PATCH 10/23] UI: Restore split-screen divider to pre-Sv2 looks Change-Id: I240b627793b615c82bd07ebd77638cde180ef80f --- - .../res/color/split_divider_background.xml | 4 ++-- - .../wm/shell/common/split/SplitLayout.java | 19 ++----------------- - 2 files changed, 4 insertions(+), 19 deletions(-) + .../Shell/res/values-sw600dp/colors.xml | 21 +++++++++++++++++++ + .../WindowManager/Shell/res/values/colors.xml | 2 +- + .../wm/shell/common/split/SplitLayout.java | 19 ++--------------- + 3 files changed, 24 insertions(+), 18 deletions(-) + create mode 100644 libs/WindowManager/Shell/res/values-sw600dp/colors.xml -diff --git a/libs/WindowManager/Shell/res/color/split_divider_background.xml b/libs/WindowManager/Shell/res/color/split_divider_background.xml -index 049980803ee3..cd54ac26a7fd 100644 ---- a/libs/WindowManager/Shell/res/color/split_divider_background.xml -+++ b/libs/WindowManager/Shell/res/color/split_divider_background.xml -@@ -15,5 +15,5 @@ - ~ limitations under the License. - --> - -- -- -\ No newline at end of file -+ -+ +diff --git a/libs/WindowManager/Shell/res/values-sw600dp/colors.xml b/libs/WindowManager/Shell/res/values-sw600dp/colors.xml +new file mode 100644 +index 000000000000..79db59cad3c2 +--- /dev/null ++++ b/libs/WindowManager/Shell/res/values-sw600dp/colors.xml +@@ -0,0 +1,21 @@ ++ ++ ++ ++ @color/taskbar_background ++ +diff --git a/libs/WindowManager/Shell/res/values/colors.xml b/libs/WindowManager/Shell/res/values/colors.xml +index 6fb70006e67f..906dc71d623a 100644 +--- a/libs/WindowManager/Shell/res/values/colors.xml ++++ b/libs/WindowManager/Shell/res/values/colors.xml +@@ -18,7 +18,7 @@ + --> + + #000000 +- @color/taskbar_background ++ @android:color/black + #59000000 + #60000000 + #00000000 diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/common/split/SplitLayout.java b/libs/WindowManager/Shell/src/com/android/wm/shell/common/split/SplitLayout.java -index 45b234a6398a..f0b1ff3999bc 100644 +index b4acd6046182..b0a05d7c80d9 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/common/split/SplitLayout.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/common/split/SplitLayout.java -@@ -153,23 +153,8 @@ public final class SplitLayout implements DisplayInsetsController.OnInsetsChange +@@ -154,23 +154,8 @@ public final class SplitLayout implements DisplayInsetsController.OnInsetsChange } private void updateDividerConfig(Context context) { diff --git a/patches_platform/frameworks_base/0011-UI-Revive-navbar-layout-tuning-via-sysui_nav_bar-tun.patch b/patches_platform/frameworks_base/0011-UI-Revive-navbar-layout-tuning-via-sysui_nav_bar-tun.patch index 57a0f4c..ef39915 100644 --- a/patches_platform/frameworks_base/0011-UI-Revive-navbar-layout-tuning-via-sysui_nav_bar-tun.patch +++ b/patches_platform/frameworks_base/0011-UI-Revive-navbar-layout-tuning-via-sysui_nav_bar-tun.patch @@ -1,4 +1,4 @@ -From fd92d595cd2d3caa015c1ab1749c1a06c472ba82 Mon Sep 17 00:00:00 2001 +From 4b24750cb511cb2666335b46e053d2b3791e1d94 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Tue, 6 Oct 2020 01:41:16 +0000 Subject: [PATCH 11/23] UI: Revive navbar layout tuning via sysui_nav_bar diff --git a/patches_platform/frameworks_base/0012-UI-Use-SNAP_FIXED_RATIO-for-multi-window-globally.patch b/patches_platform/frameworks_base/0012-UI-Use-SNAP_FIXED_RATIO-for-multi-window-globally.patch index 44a818f..6c77103 100644 --- a/patches_platform/frameworks_base/0012-UI-Use-SNAP_FIXED_RATIO-for-multi-window-globally.patch +++ b/patches_platform/frameworks_base/0012-UI-Use-SNAP_FIXED_RATIO-for-multi-window-globally.patch @@ -1,4 +1,4 @@ -From ae22c5903fb6bd176d1df8de0292df0c386f1f80 Mon Sep 17 00:00:00 2001 +From 6957050c84f0fd86972408b016f3835e450de13b Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sun, 26 Apr 2020 08:56:13 +0000 Subject: [PATCH 12/23] UI: Use SNAP_FIXED_RATIO for multi-window globally @@ -78,10 +78,10 @@ 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 c2e2c91b2829..8f81427cbe67 100644 +index 75941bbb8cd3..87e3ddcf8fdf 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml -@@ -3829,7 +3829,7 @@ +@@ -3882,7 +3882,7 @@ 1 - 3 snap targets: fixed ratio, 1:1, (1 - fixed ratio) 2 - 1 snap target: 1:1 --> diff --git a/patches_platform/frameworks_base/0013-core-Remove-old-app-target-SDK-dialog.patch b/patches_platform/frameworks_base/0013-core-Remove-old-app-target-SDK-dialog.patch index f239696..23c7302 100644 --- a/patches_platform/frameworks_base/0013-core-Remove-old-app-target-SDK-dialog.patch +++ b/patches_platform/frameworks_base/0013-core-Remove-old-app-target-SDK-dialog.patch @@ -1,4 +1,4 @@ -From 519ee96fabf6d29ed22641f3a587012d92cc6846 Mon Sep 17 00:00:00 2001 +From 37a4d23386f038939c42819f050d22bd23627292 Mon Sep 17 00:00:00 2001 From: Danny Lin Date: Tue, 3 Nov 2020 22:43:12 -0800 Subject: [PATCH 13/23] core: Remove old app target SDK dialog diff --git a/patches_platform/frameworks_base/0014-Paint-Enable-subpixel-text-positioning-by-default.patch b/patches_platform/frameworks_base/0014-Paint-Enable-subpixel-text-positioning-by-default.patch index 5dd38b5..56fb96f 100644 --- a/patches_platform/frameworks_base/0014-Paint-Enable-subpixel-text-positioning-by-default.patch +++ b/patches_platform/frameworks_base/0014-Paint-Enable-subpixel-text-positioning-by-default.patch @@ -1,4 +1,4 @@ -From b715efda04efd69a0bfd4a9fd003e519b1255e96 Mon Sep 17 00:00:00 2001 +From ad6e9615c4473cb86b36ef383dfb74f4df078901 Mon Sep 17 00:00:00 2001 From: Danny Lin Date: Tue, 5 Oct 2021 21:01:50 -0700 Subject: [PATCH 14/23] Paint: Enable subpixel text positioning by default diff --git a/patches_platform/frameworks_base/0015-Add-support-for-app-signature-spoofing.patch b/patches_platform/frameworks_base/0015-Add-support-for-app-signature-spoofing.patch index a8053a4..f8ec237 100644 --- a/patches_platform/frameworks_base/0015-Add-support-for-app-signature-spoofing.patch +++ b/patches_platform/frameworks_base/0015-Add-support-for-app-signature-spoofing.patch @@ -1,4 +1,4 @@ -From 8b06ea31edf57c5b6252a188f2035c92c6c2bd31 Mon Sep 17 00:00:00 2001 +From d6f40aec4b7a24c61f37c0c46240b4a263e4e796 Mon Sep 17 00:00:00 2001 From: Danny Lin Date: Sat, 16 Oct 2021 05:27:57 -0700 Subject: [PATCH 15/23] Add support for app signature spoofing @@ -58,10 +58,10 @@ index 487e57d114c9..04e69741b9fd 100644 field public static final String MICROPHONE = "android.permission-group.MICROPHONE"; field public static final String NEARBY_DEVICES = "android.permission-group.NEARBY_DEVICES"; diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml -index bbe31240f5f3..7d717b2106a1 100644 +index bbc3a7369423..af04d9d18fbd 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml -@@ -3572,6 +3572,21 @@ +@@ -3577,6 +3577,21 @@ android:description="@string/permdesc_getPackageSize" android:protectionLevel="normal" /> @@ -84,10 +84,10 @@ index bbe31240f5f3..7d717b2106a1 100644 {@link android.content.pm.PackageManager#addPackageToPreferred} for details. --> diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml -index 9410e0682106..7ed7a03f1b61 100644 +index 2091c0502b6f..6888edcf7d3c 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml -@@ -977,6 +977,18 @@ +@@ -982,6 +982,18 @@ diff --git a/patches_platform/frameworks_base/0016-Spoof-product-name-for-Google-Play-Services.patch b/patches_platform/frameworks_base/0016-Spoof-product-name-for-Google-Play-Services.patch index 701badc..8e2afec 100644 --- a/patches_platform/frameworks_base/0016-Spoof-product-name-for-Google-Play-Services.patch +++ b/patches_platform/frameworks_base/0016-Spoof-product-name-for-Google-Play-Services.patch @@ -1,4 +1,4 @@ -From dff8fbe5dfceacfd51b3606d7b137616911a6cf6 Mon Sep 17 00:00:00 2001 +From ecbc82fa7365a4fd123a7ad945c41c0b6b78658c Mon Sep 17 00:00:00 2001 From: Danny Lin Date: Mon, 11 Oct 2021 19:59:51 -0700 Subject: [PATCH 16/23] Spoof product name for Google Play Services diff --git a/patches_platform/frameworks_base/0017-keystore-Block-key-attestation-for-SafetyNet.patch b/patches_platform/frameworks_base/0017-keystore-Block-key-attestation-for-SafetyNet.patch index 91c91a9..4360898 100644 --- a/patches_platform/frameworks_base/0017-keystore-Block-key-attestation-for-SafetyNet.patch +++ b/patches_platform/frameworks_base/0017-keystore-Block-key-attestation-for-SafetyNet.patch @@ -1,4 +1,4 @@ -From bf57e2c0560a94601c465de9cce8ae77111ba37f Mon Sep 17 00:00:00 2001 +From 229fe76ca5e1980981668fa0fc926b0982e91fba Mon Sep 17 00:00:00 2001 From: Danny Lin Date: Mon, 11 Oct 2021 20:00:44 -0700 Subject: [PATCH 17/23] keystore: Block key attestation for SafetyNet diff --git a/patches_platform/frameworks_base/0018-Limit-SafetyNet-workarounds-to-unstable-GMS-process.patch b/patches_platform/frameworks_base/0018-Limit-SafetyNet-workarounds-to-unstable-GMS-process.patch index f167f38..e05a9f1 100644 --- a/patches_platform/frameworks_base/0018-Limit-SafetyNet-workarounds-to-unstable-GMS-process.patch +++ b/patches_platform/frameworks_base/0018-Limit-SafetyNet-workarounds-to-unstable-GMS-process.patch @@ -1,4 +1,4 @@ -From 4b2da805e60f7456b60fbef0399b42270bd6d1d8 Mon Sep 17 00:00:00 2001 +From 56dbd5d3d3a54582731fcfeacaed9fa8ac542ea6 Mon Sep 17 00:00:00 2001 From: Danny Lin Date: Mon, 1 Nov 2021 20:06:48 -0700 Subject: [PATCH 18/23] Limit SafetyNet workarounds to unstable GMS process diff --git a/patches_platform/frameworks_base/0019-gmscompat-Apply-the-SafetyNet-workaround-to-Play-Sto.patch b/patches_platform/frameworks_base/0019-gmscompat-Apply-the-SafetyNet-workaround-to-Play-Sto.patch index 0225a10..d930212 100644 --- a/patches_platform/frameworks_base/0019-gmscompat-Apply-the-SafetyNet-workaround-to-Play-Sto.patch +++ b/patches_platform/frameworks_base/0019-gmscompat-Apply-the-SafetyNet-workaround-to-Play-Sto.patch @@ -1,4 +1,4 @@ -From 3e127f227f91e2cda68ae28c531c7f7034693b9e Mon Sep 17 00:00:00 2001 +From 502ad20c8b29c937821a70f26be83f481b941e4f Mon Sep 17 00:00:00 2001 From: Dyneteve Date: Tue, 23 Aug 2022 18:57:05 +0200 Subject: [PATCH 19/23] gmscompat: Apply the SafetyNet workaround to Play Store diff --git a/patches_platform/frameworks_base/0020-gmscompat-Use-Nexus-6P-fingerprint-for-CTS-Integrity.patch b/patches_platform/frameworks_base/0020-gmscompat-Use-Nexus-6P-fingerprint-for-CTS-Integrity.patch index 66e1f07..3ea7113 100644 --- a/patches_platform/frameworks_base/0020-gmscompat-Use-Nexus-6P-fingerprint-for-CTS-Integrity.patch +++ b/patches_platform/frameworks_base/0020-gmscompat-Use-Nexus-6P-fingerprint-for-CTS-Integrity.patch @@ -1,4 +1,4 @@ -From 408d79cb171d9d9d4e78c068601c8e08047b18d0 Mon Sep 17 00:00:00 2001 +From 643dcbbac4e1955c62f7760fefad20d261797e5b Mon Sep 17 00:00:00 2001 From: Dyneteve Date: Thu, 8 Sep 2022 14:39:52 +0200 Subject: [PATCH 20/23] gmscompat: Use Nexus 6P fingerprint for CTS/Integrity diff --git a/patches_platform/frameworks_base/0021-gmscompat-Use-actual-device-model-name.patch b/patches_platform/frameworks_base/0021-gmscompat-Use-actual-device-model-name.patch index 95676fa..e0c6019 100644 --- a/patches_platform/frameworks_base/0021-gmscompat-Use-actual-device-model-name.patch +++ b/patches_platform/frameworks_base/0021-gmscompat-Use-actual-device-model-name.patch @@ -1,4 +1,4 @@ -From 9e51495edc14e3cf1609eccf3d65a71720c17a09 Mon Sep 17 00:00:00 2001 +From 3f021fc317d07d0d9443832bc568161707013746 Mon Sep 17 00:00:00 2001 From: Dyneteve Date: Tue, 6 Dec 2022 15:59:08 +0100 Subject: [PATCH 21/23] gmscompat: Use actual device model name diff --git a/patches_platform/frameworks_base/0022-gmscompat-Set-shipping-level-to-32-for-devices-33.patch b/patches_platform/frameworks_base/0022-gmscompat-Set-shipping-level-to-32-for-devices-33.patch index 1ea28dd..4cc4652 100644 --- a/patches_platform/frameworks_base/0022-gmscompat-Set-shipping-level-to-32-for-devices-33.patch +++ b/patches_platform/frameworks_base/0022-gmscompat-Set-shipping-level-to-32-for-devices-33.patch @@ -1,4 +1,4 @@ -From f7ac5b583424583d440b7f2ce6bdce96fce2e209 Mon Sep 17 00:00:00 2001 +From 721c979c994c6cdf4f92dfb283d28cfeaf649a51 Mon Sep 17 00:00:00 2001 From: Anirudh Gupta Date: Wed, 4 Jan 2023 18:20:56 +0000 Subject: [PATCH 22/23] gmscompat: Set shipping level to 32 for devices >=33 diff --git a/patches_platform/frameworks_base/0023-gmscompat-Make-CTS-Play-Integrity-pass-again.patch b/patches_platform/frameworks_base/0023-gmscompat-Make-CTS-Play-Integrity-pass-again.patch index 4176b89..b05ed19 100644 --- a/patches_platform/frameworks_base/0023-gmscompat-Make-CTS-Play-Integrity-pass-again.patch +++ b/patches_platform/frameworks_base/0023-gmscompat-Make-CTS-Play-Integrity-pass-again.patch @@ -1,4 +1,4 @@ -From ebbe0af4cff77d27ab5b7b23c5d86f947428b4c4 Mon Sep 17 00:00:00 2001 +From 69908af269c76085862d4034abf615e5416838a1 Mon Sep 17 00:00:00 2001 From: Dyneteve Date: Wed, 8 Feb 2023 15:21:01 +0000 Subject: [PATCH 23/23] gmscompat: Make CTS/Play Integrity pass again diff --git a/patches_platform/packages_apps_Messaging/0001-Messaging-Add-Mark-as-read-quick-action-for-message-.patch b/patches_platform/packages_apps_Messaging/0001-Messaging-Add-Mark-as-read-quick-action-for-message-.patch index a02dfeb..0884aff 100644 --- a/patches_platform/packages_apps_Messaging/0001-Messaging-Add-Mark-as-read-quick-action-for-message-.patch +++ b/patches_platform/packages_apps_Messaging/0001-Messaging-Add-Mark-as-read-quick-action-for-message-.patch @@ -1,4 +1,4 @@ -From 3f7f3f9546f9f23d66381f7dff887cd562285ce6 Mon Sep 17 00:00:00 2001 +From c93f729acb568f290085cea4014fbe384ec40289 Mon Sep 17 00:00:00 2001 From: Paul Keith Date: Tue, 30 Oct 2018 15:46:18 +0100 Subject: [PATCH] Messaging: Add "Mark as read" quick action for message @@ -7,6 +7,7 @@ Subject: [PATCH] Messaging: Add "Mark as read" quick action for message Change-Id: I7194dca022e5062926fa35709de282721ca64320 --- res/drawable/ic_wear_read.xml | 9 +++++++++ + res/values-zh-rCN/cm_strings.xml | 1 + res/values/cm_strings.xml | 3 +++ .../messaging/datamodel/BugleNotifications.java | 14 ++++++++++++++ .../datamodel/MessageNotificationState.java | 8 ++++++++ @@ -14,7 +15,7 @@ Change-Id: I7194dca022e5062926fa35709de282721ca64320 .../messaging/receiver/NotificationReceiver.java | 12 +++++++++++- src/com/android/messaging/ui/UIIntents.java | 11 +++++++++++ src/com/android/messaging/ui/UIIntentsImpl.java | 14 ++++++++++++++ - 8 files changed, 81 insertions(+), 2 deletions(-) + 9 files changed, 82 insertions(+), 2 deletions(-) create mode 100644 res/drawable/ic_wear_read.xml diff --git a/res/drawable/ic_wear_read.xml b/res/drawable/ic_wear_read.xml @@ -32,6 +33,17 @@ index 0000000..9d017e6 + android:fillColor="#ffffff" + android:pathData="M0.41,13.41L6,19L7.41,17.58L1.83,12M22.24,5.58L11.66,16.17L7.5,12L6.07,13.41L11.66,19L23.66,7M18,7L16.59,5.58L10.24,11.93L11.66,13.34L18,7Z" /> + +diff --git a/res/values-zh-rCN/cm_strings.xml b/res/values-zh-rCN/cm_strings.xml +index 3cfebff..f1ffeab 100644 +--- a/res/values-zh-rCN/cm_strings.xml ++++ b/res/values-zh-rCN/cm_strings.xml +@@ -19,5 +19,6 @@ + 向右滑动以删除会话 + 访问表情符号 + 在键盘上显示表情符号键 ++ 标记为已读 + 短信 + diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml index f285555..858f093 100644 --- a/res/values/cm_strings.xml @@ -219,5 +231,5 @@ index d64082d..9281899 100644 * Gets a PendingIntent associated with an Intent to start an Activity. All notifications * that starts an Activity must use this method to get a PendingIntent, which achieves two -- -2.25.1 +2.34.1 diff --git a/patches_platform_personal/frameworks_base/0001-Add-keylayout-for-Backbone-One-for-Android-with-AB-X.patch b/patches_platform_personal/frameworks_base/0001-Add-keylayout-for-Backbone-One-for-Android-with-AB-X.patch new file mode 100644 index 0000000..61a3ab1 --- /dev/null +++ b/patches_platform_personal/frameworks_base/0001-Add-keylayout-for-Backbone-One-for-Android-with-AB-X.patch @@ -0,0 +1,52 @@ +From 64c0e12dc7a4eb6add7631a84dda17e2012f687c Mon Sep 17 00:00:00 2001 +From: Andy CrossGate Yan +Date: Sun, 18 Jun 2023 19:33:27 +0800 +Subject: [PATCH 01/21] Add keylayout for Backbone One for Android, with AB/XY + keys swapped + +Change-Id: Ia057c084099015b544c926cd57c37b4ac314867a +--- + data/keyboards/Vendor_358a_Product_0201.kl | 31 ++++++++++++++++++++++ + 1 file changed, 31 insertions(+) + create mode 100644 data/keyboards/Vendor_358a_Product_0201.kl + +diff --git a/data/keyboards/Vendor_358a_Product_0201.kl b/data/keyboards/Vendor_358a_Product_0201.kl +new file mode 100644 +index 000000000000..e15907f9c6f2 +--- /dev/null ++++ b/data/keyboards/Vendor_358a_Product_0201.kl +@@ -0,0 +1,31 @@ ++# ++# Backbone One for Android ++# ++ ++# AB/XY swapped ++key 305 BUTTON_A ++key 304 BUTTON_B ++key 308 BUTTON_X ++key 307 BUTTON_Y ++ ++key 310 BUTTON_L1 ++key 311 BUTTON_R1 ++key 312 BUTTON_L2 ++key 313 BUTTON_R2 ++ ++key 317 BUTTON_THUMBL ++key 318 BUTTON_THUMBR ++ ++axis 0x00 X flat 4096 ++axis 0x01 Y flat 4096 ++axis 0x02 Z flat 4096 ++axis 0x05 RZ flat 4096 ++ ++axis 0x0a LTRIGGER ++axis 0x09 RTRIGGER ++ ++axis 0x10 HAT_X ++axis 0x11 HAT_Y ++ ++key 315 BUTTON_START ++key 314 BUTTON_SELECT +-- +2.34.1 + diff --git a/patches_platform_personal/frameworks_base/0001-Add-MiuiNavbarOverlay.patch b/patches_platform_personal/frameworks_base/0002-Add-MiuiNavbarOverlay.patch similarity index 99% rename from patches_platform_personal/frameworks_base/0001-Add-MiuiNavbarOverlay.patch rename to patches_platform_personal/frameworks_base/0002-Add-MiuiNavbarOverlay.patch index e4c2e87..b6d3e6c 100644 --- a/patches_platform_personal/frameworks_base/0001-Add-MiuiNavbarOverlay.patch +++ b/patches_platform_personal/frameworks_base/0002-Add-MiuiNavbarOverlay.patch @@ -1,7 +1,7 @@ -From fe9ef4702e81d02d75fb9e6df73fcf013fb955af Mon Sep 17 00:00:00 2001 +From 2e9df83d63b2c316a6cec6fcbc253ef0919cf5d3 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sun, 20 Jun 2021 03:39:32 +0000 -Subject: [PATCH 01/20] Add MiuiNavbarOverlay +Subject: [PATCH 02/21] Add MiuiNavbarOverlay Change-Id: I0e6791abc3c9521d7dc612df2fec2b041affe7e9 --- @@ -29,7 +29,7 @@ Change-Id: I0e6791abc3c9521d7dc612df2fec2b041affe7e9 create mode 100644 packages/overlays/MiuiNavbarOverlay/res/drawable-440dpi-v4/ic_sysbar_recent_darkmode.png diff --git a/packages/overlays/Android.mk b/packages/overlays/Android.mk -index 36ec11af3068..c5ee8556b75a 100644 +index 69641e69a9f2..1efc296d9689 100644 --- a/packages/overlays/Android.mk +++ b/packages/overlays/Android.mk @@ -26,6 +26,7 @@ LOCAL_REQUIRED_MODULES := \ diff --git a/patches_platform_personal/frameworks_base/0002-Disable-Bluetooth-by-default.patch b/patches_platform_personal/frameworks_base/0003-Disable-Bluetooth-by-default.patch similarity index 88% rename from patches_platform_personal/frameworks_base/0002-Disable-Bluetooth-by-default.patch rename to patches_platform_personal/frameworks_base/0003-Disable-Bluetooth-by-default.patch index f21219a..824556f 100644 --- a/patches_platform_personal/frameworks_base/0002-Disable-Bluetooth-by-default.patch +++ b/patches_platform_personal/frameworks_base/0003-Disable-Bluetooth-by-default.patch @@ -1,7 +1,7 @@ -From 964e570909040dc8de452f5269f633c4b4fe9519 Mon Sep 17 00:00:00 2001 +From cf35535a94712e9f81d9532fa4a494a8628b4641 Mon Sep 17 00:00:00 2001 From: Hikari-no-Tenshi Date: Thu, 30 Jan 2020 22:20:54 +0200 -Subject: [PATCH 02/20] Disable Bluetooth by default +Subject: [PATCH 03/21] Disable Bluetooth by default Change-Id: Iea5d24f977928bf01cd7a46b98c75c0a4bd6a23c --- diff --git a/patches_platform_personal/frameworks_base/0003-Disable-cursor-drag-by-default-for-editable-TextView.patch b/patches_platform_personal/frameworks_base/0004-Disable-cursor-drag-by-default-for-editable-TextView.patch similarity index 88% rename from patches_platform_personal/frameworks_base/0003-Disable-cursor-drag-by-default-for-editable-TextView.patch rename to patches_platform_personal/frameworks_base/0004-Disable-cursor-drag-by-default-for-editable-TextView.patch index 468907c..c8ea5f8 100644 --- a/patches_platform_personal/frameworks_base/0003-Disable-cursor-drag-by-default-for-editable-TextView.patch +++ b/patches_platform_personal/frameworks_base/0004-Disable-cursor-drag-by-default-for-editable-TextView.patch @@ -1,7 +1,7 @@ -From 0db4a23679a9c74790cc618abeeeadaf0a202665 Mon Sep 17 00:00:00 2001 +From 8201fef9ab532374796549c938ea2fc172bf20f5 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Mon, 27 Sep 2021 16:30:00 +0000 -Subject: [PATCH 03/20] Disable cursor drag by default for editable TextViews +Subject: [PATCH 04/21] Disable cursor drag by default for editable TextViews Requested by @TadiT7 diff --git a/patches_platform_personal/frameworks_base/0004-Disable-RESTRICTED-bucket-toast.patch b/patches_platform_personal/frameworks_base/0005-Disable-RESTRICTED-bucket-toast.patch similarity index 91% rename from patches_platform_personal/frameworks_base/0004-Disable-RESTRICTED-bucket-toast.patch rename to patches_platform_personal/frameworks_base/0005-Disable-RESTRICTED-bucket-toast.patch index babde32..769ff2a 100644 --- a/patches_platform_personal/frameworks_base/0004-Disable-RESTRICTED-bucket-toast.patch +++ b/patches_platform_personal/frameworks_base/0005-Disable-RESTRICTED-bucket-toast.patch @@ -1,7 +1,7 @@ -From 6a0d86399b5d61301d2184a6b10152462380dc10 Mon Sep 17 00:00:00 2001 +From 0dba3680960846702881fed2b3e716825af92d58 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sun, 3 Jul 2022 00:08:42 +0000 -Subject: [PATCH 04/20] Disable "RESTRICTED bucket" toast +Subject: [PATCH 05/21] Disable "RESTRICTED bucket" toast Change-Id: I20a328d3c77962f3a6095bfca42d0b165a093ce8 --- @@ -9,10 +9,10 @@ Change-Id: I20a328d3c77962f3a6095bfca42d0b165a093ce8 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java b/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java -index a6f47d4e4908..ac7cabba3ddc 100644 +index b27ff411dd58..5ce49bd98c5c 100644 --- a/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java +++ b/apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java -@@ -1781,25 +1781,7 @@ public class AppStandbyController +@@ -1792,25 +1792,7 @@ public class AppStandbyController .noteRestrictionAttempt(packageName, userId, elapsedRealtime, reason); if (isForcedByUser) { diff --git a/patches_platform_personal/frameworks_base/0005-Keyguard-Adjust-clock-style.patch b/patches_platform_personal/frameworks_base/0006-Keyguard-Adjust-clock-style.patch similarity index 93% rename from patches_platform_personal/frameworks_base/0005-Keyguard-Adjust-clock-style.patch rename to patches_platform_personal/frameworks_base/0006-Keyguard-Adjust-clock-style.patch index d3cf563..070e5b9 100644 --- a/patches_platform_personal/frameworks_base/0005-Keyguard-Adjust-clock-style.patch +++ b/patches_platform_personal/frameworks_base/0006-Keyguard-Adjust-clock-style.patch @@ -1,7 +1,7 @@ -From 64d1e22f654f996d3cc46334f4a75b6c37c16268 Mon Sep 17 00:00:00 2001 +From c16a1a66b9e311a2dfbf1925d8f17783933571e5 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Thu, 2 Sep 2021 16:15:19 +0000 -Subject: [PATCH 05/20] Keyguard: Adjust clock style +Subject: [PATCH 06/21] Keyguard: Adjust clock style Thinner font, less padding and unintrusive colors @@ -57,26 +57,26 @@ index 000000000000..f80af4376ff1 + @*android:color/primary_text_material_light + diff --git a/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/AnimatableClockView.kt b/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/AnimatableClockView.kt -index 462b90a10aee..d5fdb185d042 100644 +index 86bd5f2bff5a..b99a8ba487cb 100644 --- a/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/AnimatableClockView.kt +++ b/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/AnimatableClockView.kt -@@ -147,7 +147,7 @@ class AnimatableClockView @JvmOverloads constructor( +@@ -146,7 +146,7 @@ class AnimatableClockView @JvmOverloads constructor( fun refreshTime() { time.timeInMillis = timeOverrideInMillis ?: System.currentTimeMillis() contentDescription = DateFormat.format(descFormat, time) - val formattedText = DateFormat.format(format, time) + val formattedText = DateFormat.format(format, time).toString() + ' ' - logBuffer?.log(tag, DEBUG, + logBuffer?.log(TAG, DEBUG, { str1 = formattedText?.toString() }, { "refreshTime: new formattedText=$str1" } diff --git a/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/DefaultClockController.kt b/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/DefaultClockController.kt -index e138ef8a1ea8..fa7979a0b598 100644 +index 4df7a44d3e1d..447160a8cb63 100644 --- a/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/DefaultClockController.kt +++ b/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/DefaultClockController.kt -@@ -131,9 +131,9 @@ class DefaultClockController( - fun updateColor() { - val color = - if (isRegionDark) { +@@ -143,9 +143,9 @@ class DefaultClockController( + if (seedColor != null) { + seedColor!! + } else if (isRegionDark) { - resources.getColor(android.R.color.system_accent1_100) + resources.getColor(R.color.clock_default_color_dark) } else { @@ -99,10 +99,10 @@ index 7c5dbc247428..64657547621f 100644 /> diff --git a/packages/SystemUI/res-keyguard/values/dimens.xml b/packages/SystemUI/res-keyguard/values/dimens.xml -index c5ffdc0051da..b3f3d46c5dcd 100644 +index edd6eff92c1c..14df77dc4a4e 100644 --- a/packages/SystemUI/res-keyguard/values/dimens.xml +++ b/packages/SystemUI/res-keyguard/values/dimens.xml -@@ -94,10 +94,10 @@ +@@ -91,10 +91,10 @@ 12dp @@ -143,10 +143,10 @@ index 8b8594032816..9135e78f3e4c 100644 android:singleLine="true" systemui:showMissingSim="true" diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml -index dfc6ba4720f2..6c5e6d73feb7 100644 +index 892c2f4caa39..6996e41e08da 100644 --- a/packages/SystemUI/res/values/styles.xml +++ b/packages/SystemUI/res/values/styles.xml -@@ -301,7 +301,7 @@ +@@ -302,7 +302,7 @@ @style/DualToneDarkTheme @*android:color/primary_text_material_dark @*android:color/secondary_text_material_dark @@ -155,7 +155,7 @@ index dfc6ba4720f2..6c5e6d73feb7 100644 @*android:color/error_color_material_dark @style/LockPatternViewStyle @style/LockPatternContainerStyle -@@ -323,7 +323,7 @@ +@@ -324,7 +324,7 @@ - +diff --git a/res/values-sw600dp-land/dimens.xml b/res/values-sw600dp-land/dimens.xml +index 2c55578de..157e8b4ba 100644 +--- a/res/values-sw600dp-land/dimens.xml ++++ b/res/values-sw600dp-land/dimens.xml +@@ -21,7 +21,8 @@ + + + 0dp ++ 48dp + + +- 90dp ++ 100dp + diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml -index 27895968d..bde6b225c 100644 +index 86bc89581..2c3a50de6 100644 --- a/res/values-sw600dp/dimens.xml +++ b/res/values-sw600dp/dimens.xml -@@ -54,11 +54,11 @@ +@@ -29,19 +29,24 @@ + 125sp + 115sp + 18sp ++ 18sp + 20sp + 48sp + 20sp + ++ 32dp + 180dp + 80dp + + 8dp + ++ 46dp ++ + 8dp + + + 48dp ++ 96dp + + + 200dp +@@ -49,14 +54,14 @@ 170dp @@ -977,6 +1408,72 @@ index 27895968d..bde6b225c 100644 20dp + +- 112dp ++ 125dp + +diff --git a/res/values-sw720dp/dimens.xml b/res/values-sw720dp/dimens.xml +index 8b786f0e9..92f495a76 100644 +--- a/res/values-sw720dp/dimens.xml ++++ b/res/values-sw720dp/dimens.xml +@@ -22,5 +22,5 @@ + 312dp + + +- 124dp ++ 138dp + +diff --git a/res/values-w360dp-h420dp/bools.xml b/res/values-w360dp-h420dp/bools.xml +new file mode 100644 +index 000000000..0708712f7 +--- /dev/null ++++ b/res/values-w360dp-h420dp/bools.xml +@@ -0,0 +1,19 @@ ++ ++ ++ ++ ++ true ++ +diff --git a/res/values-w470dp-land/bools.xml b/res/values-w470dp-land/bools.xml +new file mode 100644 +index 000000000..958e07c92 +--- /dev/null ++++ b/res/values-w470dp-land/bools.xml +@@ -0,0 +1,20 @@ ++ ++ ++ ++ ++ true ++ true ++ diff --git a/res/values/attrs.xml b/res/values/attrs.xml index 2eb1ab4c8..9a619bced 100644 --- a/res/values/attrs.xml @@ -999,6 +1496,17 @@ index 2eb1ab4c8..9a619bced 100644 - - +diff --git a/res/values/bools.xml b/res/values/bools.xml +index c89c10303..3683454b6 100644 +--- a/res/values/bools.xml ++++ b/res/values/bools.xml +@@ -16,4 +16,6 @@ + + + false ++ false ++ false + diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml index 8bb085635..6da5ce9ec 100644 --- a/res/values/cm_strings.xml @@ -1016,12 +1524,48 @@ index 8bb085635..6da5ce9ec 100644 - Backed diff --git a/res/values/colors.xml b/res/values/colors.xml -index 853559f1c..91ca13873 100644 +index cd1ea9060..91ca13873 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml -@@ -70,12 +70,4 @@ - @android:color/system_accent3_600 - @android:color/system_accent3_900 +@@ -18,6 +18,7 @@ + + + #FF000000 ++ #DE000000 + #8A000000 + + #FFFFFFFF +@@ -28,8 +29,15 @@ + + #00000000 + ++ #28FFFFFF ++ ++ #B3FFFFFF ++ + @android:color/system_neutral1_900 + ++ ++ #000000 ++ + @android:color/system_accent3_200 + @android:color/system_accent2_200 + @android:color/system_neutral1_800 +@@ -50,6 +58,7 @@ + + @color/system_neutral2_500 + ++ @android:color/system_neutral2_100 + @android:color/system_neutral2_300 + @android:color/system_neutral2_500 + @android:color/system_neutral2_700 +@@ -57,13 +66,8 @@ + @android:color/system_neutral1_50 + + @android:color/system_accent3_100 ++ @android:color/system_accent3_200 ++ @android:color/system_accent3_600 ++ @android:color/system_accent3_900 - @android:color/system_accent1_100 - @android:color/system_accent1_700 @@ -1033,10 +1577,41 @@ index 853559f1c..91ca13873 100644 - @android:color/system_accent2_800 diff --git a/res/values/dimens.xml b/res/values/dimens.xml -index fde225b75..c26d93ddd 100644 +index bf5128d1a..c136fe25a 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml -@@ -86,11 +86,11 @@ +@@ -32,6 +32,7 @@ + + 16sp + ++ 16sp + 6dp + 12dp + 240dp +@@ -60,11 +61,14 @@ + + 4dp + ++ 14sp + 6dp + ++ 24dp + 90dp + 56dp + ++ 22dp + 4dip + + 4dp +@@ -73,6 +77,7 @@ + + + 16dp ++ 60dp + 294dp + + +@@ -81,18 +86,29 @@ 110dp @@ -1052,8 +1627,9 @@ index fde225b75..c26d93ddd 100644 10dp -@@ -98,6 +98,11 @@ - 80dp + +- 80dp ++ 88dp 80dp + @@ -1061,10 +1637,26 @@ index fde225b75..c26d93ddd 100644 + 2.0 + 2.0 + - - 1dp ++ ++ 1dp ++ ++ ++ 6dp ++ + + 48dp -@@ -139,8 +144,4 @@ +@@ -105,6 +121,9 @@ + + 12dp + ++ ++ 8dp ++ + + 16dp + +@@ -125,8 +144,4 @@ 4dp 0.5 @@ -1096,8 +1688,71 @@ index c2a2ea6bc..76dae4905 100644 - - EEE MMM d +diff --git a/res/values/fractions.xml b/res/values/fractions.xml +index e3048d4c5..3cee14c62 100644 +--- a/res/values/fractions.xml ++++ b/res/values/fractions.xml +@@ -15,6 +15,12 @@ + --> + + ++ ++ -100% ++ ++ ++ 80% ++ + 0 + 0.25 + +diff --git a/res/values/strings.xml b/res/values/strings.xml +index 400a8ec7b..443d182e3 100644 +--- a/res/values/strings.xml ++++ b/res/values/strings.xml +@@ -32,6 +32,9 @@ + + Vibrate + ++ ++ Repeat ++ + + Delete + +@@ -480,6 +483,8 @@ + Cities + + Settings ++ ++ Help + + Screen saver + +@@ -892,8 +897,12 @@ + Timer paused + + %d timers paused ++ ++ Tap to see your timers + + %d timers ++ ++ Next timer: %s + + + +@@ -929,6 +938,9 @@ + + Yesterday, %1$s + ++ Tomorrow ++ ++ Yesterday + + + Next alarm: %s diff --git a/res/values/styles.xml b/res/values/styles.xml -index 98bd74f52..683df4ee5 100644 +index 98bd74f52..8c6364344 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -22,10 +22,27 @@ @@ -1128,24 +1783,22 @@ index 98bd74f52..683df4ee5 100644 -+ + @@ -1284,6 +1937,19 @@ index 98bd74f52..683df4ee5 100644 - @style/Theme.DeskClock.DigitalWidgetLightBg - +diff --git a/res/values/themes.xml b/res/values/themes.xml +index 98d7b634d..08921baec 100644 +--- a/res/values/themes.xml ++++ b/res/values/themes.xml +@@ -15,7 +15,7 @@ + limitations under the License. + --> + +- ++ + + - -- - - -@@ -182,4 +182,4 @@ - 24sp - 2 - -- -\ No newline at end of file -+ diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java -index 4a4202ecc6..58e8c2508a 100644 +index 9222e456e5..678c0dfd80 100644 --- a/quickstep/src/com/android/quickstep/views/RecentsView.java +++ b/quickstep/src/com/android/quickstep/views/RecentsView.java -@@ -717,7 +717,7 @@ public abstract class RecentsView -- -2.25.1 +2.34.1 diff --git a/patches_platform_personal/packages_apps_Trebuchet/0002-Trebuchet-Kill-haptics-in-recents.patch b/patches_platform_personal/packages_apps_Trebuchet/0002-Trebuchet-Kill-haptics-in-recents.patch index 3fef533..14a501e 100644 --- a/patches_platform_personal/packages_apps_Trebuchet/0002-Trebuchet-Kill-haptics-in-recents.patch +++ b/patches_platform_personal/packages_apps_Trebuchet/0002-Trebuchet-Kill-haptics-in-recents.patch @@ -1,4 +1,4 @@ -From 3b51af674b9aa916e86fcfe0034ba3dfc0359ae1 Mon Sep 17 00:00:00 2001 +From c04fae6b45b624a39d684c4b6cf02440a3fe83b5 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Fri, 18 Mar 2022 08:42:18 +0000 Subject: [PATCH 2/2] Trebuchet: Kill haptics in recents @@ -13,14 +13,14 @@ Change-Id: Ie3b0eabe8cc0421e696720740edc492cae2f5153 3 files changed, 32 deletions(-) diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java -index 53dc9dd873..c8d89edb97 100644 +index 847114a960..eef4be2964 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java +++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java -@@ -429,14 +429,6 @@ public class NoButtonQuickSwitchTouchController implements TouchController, +@@ -419,14 +419,6 @@ public class NoButtonQuickSwitchTouchController implements TouchController, nonOverviewAnim.setFloatValues(startProgress, endProgress); mNonOverviewAnim.dispatchOnStart(); } -- if (targetState == QUICK_SWITCH) { +- if (targetState == QUICK_SWITCH_FROM_HOME) { - // Navigating to quick switch, add scroll feedback since the first time is not - // considered a scroll by the RecentsView. - VibratorWrapper.INSTANCE.get(mLauncher).vibrate( @@ -32,10 +32,10 @@ index 53dc9dd873..c8d89edb97 100644 nonOverviewAnim.setDuration(Math.max(xDuration, yDuration)); mNonOverviewAnim.setEndAction(() -> onAnimationToStateCompleted(targetState)); diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java -index ca7f633bbc..61ee609535 100644 +index eddc50c64f..09f253b08d 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java +++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java -@@ -367,11 +367,6 @@ public abstract class TaskViewTouchController +@@ -369,11 +369,6 @@ public abstract class TaskViewTouchController mCurrentAnimation.startWithVelocity(mActivity, goingToEnd, velocity * orientationHandler.getSecondaryTranslationDirectionFactor(), mEndDisplacement, animationDuration); @@ -48,10 +48,10 @@ index ca7f633bbc..61ee609535 100644 private void clearState() { diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java -index 58e8c2508a..786db49be5 100644 +index 678c0dfd80..8e75a7c18d 100644 --- a/quickstep/src/com/android/quickstep/views/RecentsView.java +++ b/quickstep/src/com/android/quickstep/views/RecentsView.java -@@ -1339,25 +1339,6 @@ public abstract class RecentsView Date: Thu, 22 Sep 2022 12:37:50 +0000 Subject: [PATCH 1/8] TrebleSettings: Screen resolution & refresh rate @@ -6,14 +6,14 @@ Subject: [PATCH 1/8] TrebleSettings: Screen resolution & refresh rate Change-Id: I4a4679cdb6d4ede55479e9ab2f014342025b0fec --- AndroidManifest.xml | 8 + - res/drawable/ic_settings_treble.xml | 10 ++ + res/drawable/ic_settings_treble.xml | 10 + res/values/menu_keys.xml | 1 + - res/values/strings.xml | 10 ++ + res/values/strings.xml | 10 + res/xml/top_level_settings.xml | 9 + res/xml/treble_settings.xml | 18 ++ - ...lutionRefreshRatePreferenceController.java | 169 ++++++++++++++++++ + ...lutionRefreshRatePreferenceController.java | 173 ++++++++++++++++++ .../settings/treble/TrebleSettings.java | 39 ++++ - 8 files changed, 264 insertions(+) + 8 files changed, 268 insertions(+) create mode 100644 res/drawable/ic_settings_treble.xml create mode 100644 res/xml/treble_settings.xml create mode 100644 src/com/android/settings/treble/ScreenResolutionRefreshRatePreferenceController.java @@ -133,10 +133,10 @@ index 0000000000..1a82c468a2 + diff --git a/src/com/android/settings/treble/ScreenResolutionRefreshRatePreferenceController.java b/src/com/android/settings/treble/ScreenResolutionRefreshRatePreferenceController.java new file mode 100644 -index 0000000000..5d14f13209 +index 0000000000..35d67f2da1 --- /dev/null +++ b/src/com/android/settings/treble/ScreenResolutionRefreshRatePreferenceController.java -@@ -0,0 +1,169 @@ +@@ -0,0 +1,173 @@ +package com.android.settings.treble; + +import static android.content.Intent.ACTION_BOOT_COMPLETED; @@ -235,8 +235,12 @@ index 0000000000..5d14f13209 + public void updateState(Preference preference) { + int id = SurfaceControl.getDynamicDisplayInfo(SurfaceControl.getInternalDisplayToken()).activeDisplayModeId; + int index = mListPreference.findIndexOfValue(String.valueOf(id)); -+ mListPreference.setValueIndex(index); -+ mListPreference.setSummary(mListPreference.getEntries()[index]); ++ try { ++ mListPreference.setValueIndex(index); ++ mListPreference.setSummary(mListPreference.getEntries()[index]); ++ } catch (ArrayIndexOutOfBoundsException e) { ++ e.printStackTrace(); ++ } + } + + @Override diff --git a/patches_treble/packages_apps_Settings/0002-TrebleSettings-Basic-audio-and-display-fixes.patch b/patches_treble/packages_apps_Settings/0002-TrebleSettings-Basic-audio-and-display-fixes.patch index 2129d23..eb6d56b 100644 --- a/patches_treble/packages_apps_Settings/0002-TrebleSettings-Basic-audio-and-display-fixes.patch +++ b/patches_treble/packages_apps_Settings/0002-TrebleSettings-Basic-audio-and-display-fixes.patch @@ -1,4 +1,4 @@ -From 7f38cb8576433a221970b5dc3947c7a2bb99595a Mon Sep 17 00:00:00 2001 +From 5e8b0836fb7eff4ea034ce5b9981ce9e9971ec4b Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sat, 24 Sep 2022 03:38:41 +0000 Subject: [PATCH 2/8] TrebleSettings: Basic audio and display fixes diff --git a/patches_treble/packages_apps_Settings/0003-TrebleSettings-IMS.patch b/patches_treble/packages_apps_Settings/0003-TrebleSettings-IMS.patch index 41079f8..7b27b37 100644 --- a/patches_treble/packages_apps_Settings/0003-TrebleSettings-IMS.patch +++ b/patches_treble/packages_apps_Settings/0003-TrebleSettings-IMS.patch @@ -1,4 +1,4 @@ -From 6a913538449ff2097b6f360554f8449ebe781ace Mon Sep 17 00:00:00 2001 +From 25ef7392032f02607cbaab2165927d4c3f45368f Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Tue, 11 Oct 2022 10:29:36 +0000 Subject: [PATCH 3/8] TrebleSettings: IMS diff --git a/patches_treble/packages_apps_Settings/0004-TrebleSettings-Disable-A2DP-offload.patch b/patches_treble/packages_apps_Settings/0004-TrebleSettings-Disable-A2DP-offload.patch index 76da069..0a4dbd8 100644 --- a/patches_treble/packages_apps_Settings/0004-TrebleSettings-Disable-A2DP-offload.patch +++ b/patches_treble/packages_apps_Settings/0004-TrebleSettings-Disable-A2DP-offload.patch @@ -1,4 +1,4 @@ -From dd2d72d6b43693ea5c67eef3ab49aae29b63ae8d Mon Sep 17 00:00:00 2001 +From 944adfb3d9a4f18bdda1e92b80f720bb33aed0eb Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sat, 10 Dec 2022 12:04:37 +0000 Subject: [PATCH 4/8] TrebleSettings: Disable A2DP offload diff --git a/patches_treble/packages_apps_Settings/0005-TrebleSettings-Alternative-audio-jack-detection.patch b/patches_treble/packages_apps_Settings/0005-TrebleSettings-Alternative-audio-jack-detection.patch index a2af57a..3cc9d1a 100644 --- a/patches_treble/packages_apps_Settings/0005-TrebleSettings-Alternative-audio-jack-detection.patch +++ b/patches_treble/packages_apps_Settings/0005-TrebleSettings-Alternative-audio-jack-detection.patch @@ -1,4 +1,4 @@ -From ac0bdd1f060115d00762a4d29c214fce2e41e960 Mon Sep 17 00:00:00 2001 +From 08b78bde66809487d882ebb101d379d5de808af4 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sat, 10 Dec 2022 14:16:50 +0000 Subject: [PATCH 5/8] TrebleSettings: Alternative audio jack detection diff --git a/patches_treble/packages_apps_Settings/0006-TrebleSettings-Override-minimum-brightness.patch b/patches_treble/packages_apps_Settings/0006-TrebleSettings-Override-minimum-brightness.patch index 63f22f7..bf845a5 100644 --- a/patches_treble/packages_apps_Settings/0006-TrebleSettings-Override-minimum-brightness.patch +++ b/patches_treble/packages_apps_Settings/0006-TrebleSettings-Override-minimum-brightness.patch @@ -1,4 +1,4 @@ -From ed12a1c194aaf80b4c466fbca43bd846fc03137b Mon Sep 17 00:00:00 2001 +From e87ca51ba6e4bcdb29449e3bd896a2d7166bad7a Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sat, 17 Dec 2022 10:29:05 +0000 Subject: [PATCH 6/8] TrebleSettings: Override minimum brightness diff --git a/patches_treble/packages_apps_Settings/0007-TrebleSettings-Override-navbar-availability.patch b/patches_treble/packages_apps_Settings/0007-TrebleSettings-Override-navbar-availability.patch index 685f842..a443c9c 100644 --- a/patches_treble/packages_apps_Settings/0007-TrebleSettings-Override-navbar-availability.patch +++ b/patches_treble/packages_apps_Settings/0007-TrebleSettings-Override-navbar-availability.patch @@ -1,4 +1,4 @@ -From a6a87bfde5a552ac56f4e0a9c5fc4d20651bcb1a Mon Sep 17 00:00:00 2001 +From aaa4bae7bf8f22569f434f0b183d7dfc3c547ed6 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sat, 17 Dec 2022 11:00:38 +0000 Subject: [PATCH 7/8] TrebleSettings: Override navbar availability diff --git a/patches_treble/packages_apps_Settings/0008-TrebleSettings-Securize-on-demand.patch b/patches_treble/packages_apps_Settings/0008-TrebleSettings-Securize-on-demand.patch index d3cfe09..7ab68de 100644 --- a/patches_treble/packages_apps_Settings/0008-TrebleSettings-Securize-on-demand.patch +++ b/patches_treble/packages_apps_Settings/0008-TrebleSettings-Securize-on-demand.patch @@ -1,4 +1,4 @@ -From 4d81eae95fe9b0265faee7fffafdc9487c856569 Mon Sep 17 00:00:00 2001 +From 382deaccfef1178077cd9c697e42d5bdcbe8c743 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sat, 17 Dec 2022 14:30:52 +0000 Subject: [PATCH 8/8] TrebleSettings: Securize on-demand diff --git a/patches_treble/packages_modules_Bluetooth/0001-audio_hal_interface-Optionally-use-sysbta-HAL.patch b/patches_treble/packages_modules_Bluetooth/0001-audio_hal_interface-Optionally-use-sysbta-HAL.patch index 9833adf..4bc9b59 100644 --- a/patches_treble/packages_modules_Bluetooth/0001-audio_hal_interface-Optionally-use-sysbta-HAL.patch +++ b/patches_treble/packages_modules_Bluetooth/0001-audio_hal_interface-Optionally-use-sysbta-HAL.patch @@ -1,4 +1,4 @@ -From 6d9740fc670b43077791f3880be05bb81cb1c38e Mon Sep 17 00:00:00 2001 +From 0385e978400c808b45db2488996ac7c2b21cd02a Mon Sep 17 00:00:00 2001 From: Peter Cai Date: Wed, 24 Aug 2022 15:45:18 -0400 Subject: [PATCH] audio_hal_interface: Optionally use sysbta HAL @@ -13,31 +13,31 @@ Change-Id: I59973e6ec84c5923be8a7c67b36b2e237f000860 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/system/audio_hal_interface/aidl/client_interface_aidl.cc b/system/audio_hal_interface/aidl/client_interface_aidl.cc -index efdc469de4..3dd65b5394 100644 +index 9af28031f7..5a9dbbccad 100644 --- a/system/audio_hal_interface/aidl/client_interface_aidl.cc +++ b/system/audio_hal_interface/aidl/client_interface_aidl.cc @@ -56,7 +56,7 @@ BluetoothAudioClientInterface::BluetoothAudioClientInterface( bool BluetoothAudioClientInterface::is_aidl_available() { - auto service = AServiceManager_checkService( + return AServiceManager_isDeclared( - kDefaultAudioProviderFactoryInterface.c_str()); + audioProviderFactoryInterface().c_str()); - return (service != nullptr); } -@@ -73,7 +73,7 @@ BluetoothAudioClientInterface::GetAudioCapabilities(SessionType session_type) { + std::vector +@@ -72,7 +72,7 @@ BluetoothAudioClientInterface::GetAudioCapabilities(SessionType session_type) { } auto provider_factory = IBluetoothAudioProviderFactory::fromBinder( - ::ndk::SpAIBinder(AServiceManager_getService( + ::ndk::SpAIBinder(AServiceManager_waitForService( - kDefaultAudioProviderFactoryInterface.c_str()))); + audioProviderFactoryInterface().c_str()))); if (provider_factory == nullptr) { LOG(ERROR) << __func__ << ", can't get capability from unknown factory"; -@@ -101,7 +101,7 @@ void BluetoothAudioClientInterface::FetchAudioProvider() { +@@ -99,7 +99,7 @@ void BluetoothAudioClientInterface::FetchAudioProvider() { } auto provider_factory = IBluetoothAudioProviderFactory::fromBinder( - ::ndk::SpAIBinder(AServiceManager_getService( + ::ndk::SpAIBinder(AServiceManager_waitForService( - kDefaultAudioProviderFactoryInterface.c_str()))); + audioProviderFactoryInterface().c_str()))); @@ -103,5 +103,5 @@ index a2c192f37d..c3d1cf35c2 100644 return; } -- -2.25.1 +2.34.1