summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-03-03Merge cherrypicks of ['googleplex-android-review.googlesource.com/21732134', ↵android-13.0.0_r55android13-d2-releaseAndroid Build Coastguard Worker
'googleplex-android-review.googlesource.com/21708911'] into tm-d2-release. Change-Id: I0e5c0f7d22a2a8a789639f36e51c134cc6ed4850
2023-03-03Revert "Add config to control BatteryStats reset logic"Michael Wachenschwanz
Revert submission 21485850 Reason for revert: introduced deadlock Reverted changes: /q/submissionid:21485850 Change-Id: Id3f920a130bc20d59abefc0a2f018873b08415ed (cherry picked from commit e01cead961206f75701326396435433b0301237f) Merged-In: Id3f920a130bc20d59abefc0a2f018873b08415ed (cherry picked from commit f70a3556ad8a6b5fd161773c699fe1c525908f1d) Merged-In: Id3f920a130bc20d59abefc0a2f018873b08415ed
2023-03-03Revert "Reset BatteryStats when device has been plugged in for a..."Michael Wachenschwanz
Revert submission 21485850 Reason for revert: introduced deadlock Reverted changes: /q/submissionid:21485850 Change-Id: Ib8dfc28154e9004e48f5537aef677b77724072b6 (cherry picked from commit 806d71bf7e2b833d6185527c7177057aae680d54) Merged-In: Ib8dfc28154e9004e48f5537aef677b77724072b6
2023-02-24Merge cherrypicks of ['googleplex-android-review.googlesource.com/21548934', ↵Android Build Coastguard Worker
'googleplex-android-review.googlesource.com/21557675'] into tm-d2-release. Change-Id: Id3fa233841f7400084bfe8e371aaa5008afb0b23
2023-02-24Reset BatteryStats when device has been plugged in for a long time.Michael Wachenschwanz
BatteryStats continues to accumlate some stats while plugged in. The avoid overflows or excessive memory usage, occasionally reset while plugged in for extended periods of time. Bug: 256919205 Test: atest BatteryStatsResetTest Change-Id: If0db995ffaf4866bbadc828a0ade37a10da91553 Merged-In: If0db995ffaf4866bbadc828a0ade37a10da91553 (cherry picked from commit 88fbe8634e87d062adf36d614ed0999a3f84683c) Merged-In: If0db995ffaf4866bbadc828a0ade37a10da91553 (cherry picked from commit ecdc44f91c8e1f29a3605d711f35ac7eb41b639c) Merged-In: If0db995ffaf4866bbadc828a0ade37a10da91553 (cherry picked from commit 86b076af74cbdf7bb8bb82cde9fa897ef76e0f5c) Merged-In: If0db995ffaf4866bbadc828a0ade37a10da91553
2023-02-24Add config to control BatteryStats reset logicMichael Wachenschwanz
Also, fix the significant charge reset logic and add BatteryStats reset tests. Fix: 269538224 Bug: 256919205 Test: atest BatteryStatsResetTest Change-Id: Id4a6dd22708ddee38dd6c10ceb6c81f6a7bfb44f Merged-In: Id4a6dd22708ddee38dd6c10ceb6c81f6a7bfb44f (cherry picked from commit ebd856f4d74ca5aed7f0b943c387c84355219b98) Merged-In: Id4a6dd22708ddee38dd6c10ceb6c81f6a7bfb44f (cherry picked from commit 68ccdde00fc790a8f9888e383f416700755ed47d) Merged-In: Id4a6dd22708ddee38dd6c10ceb6c81f6a7bfb44f
2023-02-23Merge cherrypicks of ['googleplex-android-review.googlesource.com/21380983', ↵Android Build Coastguard Worker
'googleplex-android-review.googlesource.com/21520850'] into tm-d2-release. Change-Id: I5e879e7c5ed9b3d5b9efe7ea045a0560b9938961
2023-02-23Always listen for FP on alternateBouncer showingBeverly
Fixes: 268183230 Test: manually test by launching camera over a secure lock screen with side FP enrolled. try to access the (locked) camera roll, see alternate FP bouncer and successfully authenticate from the alternate bouncer Test: atest KeyguardUpdateMonitorTest Change-Id: Ic59067f5cdada0ff99b1e8e5e78539ee9ec04e34 (cherry picked from commit b64195e69e032e980ae9fbd08db8d09e3b7670b8) (cherry picked from commit 5d76f60b7c73b1a73a1aac26593e006cac8dc64d) Merged-In: Ic59067f5cdada0ff99b1e8e5e78539ee9ec04e34
2023-02-23Update condition for when to show letterboxPablo Gamito
Makes sure we show the letterbox even during the period a window is requesting to be redrawn because of a layout change (i.e. orientation change) or for any other reason, if the window's associated surface is still visible. This avoids seeing a letterbox flicker when this happens. Bug: 256052489 Bug: 266635069 Test: Launch the dialer for a phone call or Google wallet app on a large screen device and make sure the letterbox doesn't flicker on launch. Change-Id: I7911ddc45c1ff839cc22be09caa5cc7ddc022d45 (cherry picked from commit fbcf72fa1b228a2885733dbba11e645893f01493) Merged-In: I7911ddc45c1ff839cc22be09caa5cc7ddc022d45
2023-02-23Merge cherrypicks of ['googleplex-android-review.googlesource.com/21343697', ↵Android Build Coastguard Worker
'googleplex-android-review.googlesource.com/21445893', 'googleplex-android-review.googlesource.com/21518434'] into tm-d2-release. Change-Id: If561f57ffe7a23f82668bc37cb9139ad0d8dc2e6
2023-02-23RESTRICT AUTOMERGE Flip "track_stylus_ever_used" feature flag to unreleasedMarcello Galhardo
Test: manual Fixes: b/269614190 Change-Id: I08cd4b8611fad1c4c7345d65dd1341bed95aba1b (cherry picked from commit 430f7858f5e901f019cd5b90a19355650eec19a5) Merged-In: I08cd4b8611fad1c4c7345d65dd1341bed95aba1b (cherry picked from commit 5431c0572f94650582ef037a32454349754edf80) Merged-In: I08cd4b8611fad1c4c7345d65dd1341bed95aba1b
2023-02-23Expose calls to get the inset sensitivity for the calling userWinson Chung
- Launcher is a per-user process so we should only use the per-user settings calls (since it doesn't hold INTERACT_ACROSS_USERS) Bug: 231648761 Bug: 269392826 Test: Unable to reproduce 269392826, but verified this doesn't break existing paths to adjust the insets Change-Id: I4dfaed2b393e44e0455448222c997facbb3f3116 (cherry picked from commit 8b4a5b3aa61069ffd216234fec974372d763c13c) Merged-In: I4dfaed2b393e44e0455448222c997facbb3f3116
2023-02-23Expose method for registering for current user's gesture inset scaleWinson Chung
Bug: 231648761 Test: Manual, verify taskbar insets change as user settings change Change-Id: I7dba74d608b25bdd81b5ed14d2b541d035b7cd84 (cherry picked from commit 68083f36e9c201a2ed8636e90e9bca2266e55a04) Merged-In: I7dba74d608b25bdd81b5ed14d2b541d035b7cd84
2023-02-22[coastguard skipped] Merge sparse cherrypicks from ↵Android Build Coastguard Worker
sparse-9633894-L02400000958761672 into tm-d2-release. COASTGUARD_SKIP: I4dfaed2b393e44e0455448222c997facbb3f3116 COASTGUARD_SKIP: I7dba74d608b25bdd81b5ed14d2b541d035b7cd84 COASTGUARD_SKIP: Icff1a8a09d0d200ad4b73af006e1749a3eab7f0b Change-Id: I2a856e1bd1e38eab8e81f8670c0f92e7986ea11d
2023-02-22Merge cherrypicks of ['googleplex-android-review.googlesource.com/21343697', ↵Android Build Coastguard Worker
'googleplex-android-review.googlesource.com/21445893'] into sparse-9633894-L02400000958761672. SPARSE_CHANGE: I7dba74d608b25bdd81b5ed14d2b541d035b7cd84 SPARSE_CHANGE: I4dfaed2b393e44e0455448222c997facbb3f3116 Change-Id: Icff1a8a09d0d200ad4b73af006e1749a3eab7f0b
2023-02-22Expose calls to get the inset sensitivity for the calling userWinson Chung
- Launcher is a per-user process so we should only use the per-user settings calls (since it doesn't hold INTERACT_ACROSS_USERS) Bug: 231648761 Bug: 269392826 Test: Unable to reproduce 269392826, but verified this doesn't break existing paths to adjust the insets Change-Id: I4dfaed2b393e44e0455448222c997facbb3f3116 (cherry picked from commit 8b4a5b3aa61069ffd216234fec974372d763c13c) Merged-In: I4dfaed2b393e44e0455448222c997facbb3f3116
2023-02-22Expose method for registering for current user's gesture inset scaleWinson Chung
Bug: 231648761 Test: Manual, verify taskbar insets change as user settings change Change-Id: I7dba74d608b25bdd81b5ed14d2b541d035b7cd84 (cherry picked from commit 68083f36e9c201a2ed8636e90e9bca2266e55a04) Merged-In: I7dba74d608b25bdd81b5ed14d2b541d035b7cd84
2023-02-21Merge cherrypicks of ['googleplex-android-review.googlesource.com/21467969'] ↵Android Build Coastguard Worker
into tm-d2-release. Change-Id: I66d7deec7d24f3d81b207b82a307b29831e90c7d
2023-02-21Revert change that would detectFp when FP is locked outBeverly
This reverts commit ff09044d12f936bab51ed9e7d33016616ce9e87e in addition to partially reverting ag/20141372. Bug: 269774551 Change-Id: Iea66d7782b3365dea827b854783aeddaa5c6699c (cherry picked from commit a52ed958b94ac437660d4a419b4d63ea6129759e) Merged-In: Iea66d7782b3365dea827b854783aeddaa5c6699c
2023-02-20[coastguard skipped] Merge sparse cherrypicks from ↵Android Build Coastguard Worker
sparse-9629697-L41600000958726093 into tm-d2-release. COASTGUARD_SKIP: Iea66d7782b3365dea827b854783aeddaa5c6699c COASTGUARD_SKIP: I4b58d8523765efdd40573881cb0ea599d54616f6 Change-Id: Ic39c30dc9346946cb6ae42b2ee768aac381f16f1
2023-02-20Merge cherrypicks of ['googleplex-android-review.googlesource.com/21467969'] ↵Android Build Coastguard Worker
into sparse-9629697-L41600000958726093. SPARSE_CHANGE: Iea66d7782b3365dea827b854783aeddaa5c6699c Change-Id: I4b58d8523765efdd40573881cb0ea599d54616f6
2023-02-20Revert change that would detectFp when FP is locked outBeverly
This reverts commit ff09044d12f936bab51ed9e7d33016616ce9e87e in addition to partially reverting ag/20141372. Bug: 269774551 Change-Id: Iea66d7782b3365dea827b854783aeddaa5c6699c (cherry picked from commit a52ed958b94ac437660d4a419b4d63ea6129759e) Merged-In: Iea66d7782b3365dea827b854783aeddaa5c6699c
2023-02-20[coastguard skipped] Merge sparse cherrypicks from ↵Android Build Coastguard Worker
sparse-9626057-L97400000958719169 into tm-d2-release. COASTGUARD_SKIP: I731d2404a98809d581bfd6ee4d10afc81295a361 COASTGUARD_SKIP: Ie706bba14bd9cab2069290ebe370d7fb82b4e4e9 Change-Id: I239c62903d676dc8b2be0308354ec96b1f599225
2023-02-20Merge cherrypicks of ['googleplex-android-review.googlesource.com/21338546'] ↵Android Build Coastguard Worker
into sparse-9626057-L97400000958719169. SPARSE_CHANGE: Ie706bba14bd9cab2069290ebe370d7fb82b4e4e9 Change-Id: I731d2404a98809d581bfd6ee4d10afc81295a361
2023-02-20Remove indicator theme for non-device entry activityDiya Bera
Test: Manual - Authenticate in keyguard, indicator theme matches dynamic theme Authenticate in biometric prompt, indicator theme does not have dynamic theme Enrollment, indicator theme does not have dynamic theme atest SideFpsControllerTest Fixes: 257824090 Change-Id: Ie706bba14bd9cab2069290ebe370d7fb82b4e4e9 (cherry picked from commit d4a0af407c00182bbad7f50fcbe596e85c88ebcf) Merged-In: Ie706bba14bd9cab2069290ebe370d7fb82b4e4e9
2023-02-20[coastguard skipped] Merge sparse cherrypicks from ↵Android Build Coastguard Worker
sparse-9626057-L93300000958711909 into tm-d2-release. COASTGUARD_SKIP: I87ed7f109267ea910d933b1f63d8de2bcfc61392 COASTGUARD_SKIP: Ie706bba14bd9cab2069290ebe370d7fb82b4e4e9 Change-Id: I30022195959ec3eb79a3c5155227c8ed7e483970
2023-02-20Merge cherrypicks of ['googleplex-android-review.googlesource.com/21338546'] ↵Android Build Coastguard Worker
into sparse-9626057-L93300000958711909. SPARSE_CHANGE: Ie706bba14bd9cab2069290ebe370d7fb82b4e4e9 Change-Id: I87ed7f109267ea910d933b1f63d8de2bcfc61392
2023-02-20Remove indicator theme for non-device entry activityDiya Bera
Test: Manual - Authenticate in keyguard, indicator theme matches dynamic theme Authenticate in biometric prompt, indicator theme does not have dynamic theme Enrollment, indicator theme does not have dynamic theme atest SideFpsControllerTest Fixes: 257824090 Change-Id: Ie706bba14bd9cab2069290ebe370d7fb82b4e4e9 (cherry picked from commit d4a0af407c00182bbad7f50fcbe596e85c88ebcf) Merged-In: Ie706bba14bd9cab2069290ebe370d7fb82b4e4e9
2023-02-20Merge cherrypicks of ['googleplex-android-review.googlesource.com/21338546'] ↵Android Build Coastguard Worker
into tm-d2-release. Change-Id: I86ca014365af45df48973de7054bfcc29be1958f
2023-02-20Remove indicator theme for non-device entry activityDiya Bera
Test: Manual - Authenticate in keyguard, indicator theme matches dynamic theme Authenticate in biometric prompt, indicator theme does not have dynamic theme Enrollment, indicator theme does not have dynamic theme atest SideFpsControllerTest Fixes: 257824090 Change-Id: Ie706bba14bd9cab2069290ebe370d7fb82b4e4e9 (cherry picked from commit d4a0af407c00182bbad7f50fcbe596e85c88ebcf) Merged-In: Ie706bba14bd9cab2069290ebe370d7fb82b4e4e9
2023-02-18Merge cherrypicks of ['googleplex-android-review.googlesource.com/21442504'] ↵Android Build Coastguard Worker
into tm-d2-release. Change-Id: I6d989094fc4d2d01ee82cfedb1a61a14a4889250
2023-02-18Allow to move SCM Letterbox with Taskbar visibleOleg Blinnikov
Currently SCM reduces height of the letterbox by the height of Taskbar, due to this letterboxuicontroller believes that the application does not take the full height of the screen. This CL fixes this issue by using getAppBounds() instead getBounds() to query the height of the available space on the screen. Change-Id: I152b588bc5f3673e0e2aa6e0a43d5e40ad234560 Test: atest SizeCompatTests , also manual: SCM letterbox can be moved horizontally Bug: 269030028 (cherry picked from commit d5f15e2e354df2a900cdf46ee559983138f0d0f7) Merged-In: I152b588bc5f3673e0e2aa6e0a43d5e40ad234560
2023-02-17Merge cherrypicks of ['googleplex-android-review.googlesource.com/21422765', ↵Android Build Coastguard Worker
'googleplex-android-review.googlesource.com/21447325', 'googleplex-android-review.googlesource.com/21342112'] into tm-d2-release. Change-Id: Ib8d3d11c1d7e65ebdd30880091e709805ebcd2d7
2023-02-17Re-calculate non-UDFPS fingerprint location onConfigChanged.Josh Tsuji
The location relative to the screen may change due to orientation or folded status changes. Bug: 268204504 Test: unlock on foldable/tablet Change-Id: I4de30d67d878f24ca240daa711521562f427ff7d Merged-In: I4de30d67d878f24ca240daa711521562f427ff7d (cherry picked from commit f9e4d806238cd978b6a122795a00e75358a55ec8) Merged-In: I4de30d67d878f24ca240daa711521562f427ff7d
2023-02-17Prevent the thread unsafe operation during the user switchingbaik.han
- Prevent accessing a variable that controls brightness at the same time through different threads. Bug: 267255661 Bug: 262663423 Test: Manual Change-Id: I7ffeb83e664e058a9b3e9f4f8a59d65936c43a6b (cherry picked from commit 9e345b6844e468e23f8205bc5b0c13ec75e5442e) (cherry picked from commit 069ca5d788864ff49c5bd82759ec088fda77da98) Merged-In: I7ffeb83e664e058a9b3e9f4f8a59d65936c43a6b
2023-02-17FIx occlusion status mismatch issue when screen turns off and on quicklyIssei Suzuki
When KeyguardController detects occlude status change while the keyguard is shown, it requests (UN)OCCLUDE app transition and PhoneWindowManager defers committing the occlude state. However KeyguardController and PhoneWindowManager use different predicates to decide if keygaurd is shown or not. In case the predicates return different value, occlude state in KeyguardController and PhoneWindowManager remain inconsistent. Test: manual 1. set secure lock method (pattern) 2. launch calculator app 3. push power button to screen off 4. just before the screen turns off, push power button to screen on again Bug: 232002936 Change-Id: I4cd7e62e6800897cce50a5376495c499a0b9ad10 (cherry picked from commit b71c7b40e7d0ade68e1d1a0ee93c8370edf6e415) (cherry picked from commit b323776b1b205a4b266e16fbdc4095871cc4d9ec) Merged-In: I4cd7e62e6800897cce50a5376495c499a0b9ad10
2023-02-16Merge cherrypicks of ['googleplex-android-review.googlesource.com/21408529'] ↵Android Build Coastguard Worker
into tm-d2-release. Change-Id: I0bbe24b4b62213d6da951631c7461761cdcd0d34
2023-02-16Do not scale Letterbox Inner boundsOleg Blinnikov
getLetterboxInnerBounds is assumed to return unscaled bounds, just like getLetterboxOuterBounds. This CL fixes this behaviour in getLetterboxInnerBounds by applying scaling only in getCropBoundsIfNeeded, and never in adjustBoundsForTaskbar. Bug: 269030028 Test: atest SizeCompatTests Change-Id: I697e246bedced19009af24d0b7e81fc3d8f9a48c (cherry picked from commit 9e23ff5cde35b8f452cedf3350289da18b197ef8) Merged-In: I697e246bedced19009af24d0b7e81fc3d8f9a48c
2023-02-15Merge cherrypicks of ['googleplex-android-review.googlesource.com/21298940'] ↵Android Build Coastguard Worker
into tm-d2-release. Change-Id: Ifdabd5d4734b211ac907a3bc2269f58dd283282d
2023-02-15Revert "Enable unseen notification filter for droidfood"Steve Elliott
This reverts commit d258e3fe2bcb814514b24d8384774c6b1f9e3636. Change-Id: Ib28b0441cb935ff1ab0c3ecb9da97c5d1fcd956d (cherry picked from commit c891ffb657045dbc895ebbc7e4926f6beece1a2a) Merged-In: Ib28b0441cb935ff1ab0c3ecb9da97c5d1fcd956d
2023-02-13Merge cherrypicks of ['googleplex-android-review.googlesource.com/21259944', ↵Android Build Coastguard Worker
'googleplex-android-review.googlesource.com/21359498', 'googleplex-android-review.googlesource.com/21336521'] into tm-d2-release. Change-Id: I621d8d65e59d34388569e811705ac679a02433cb
2023-02-13Add overlayfinishing state.Victor Truong
There was an error due to unbind during an async function causing the connection to be set to null before unbind is called. Add overlayfinishing state to prevent overlay finishing consumer to be added twice causing a NullPointerException. Bug: 267335683 Test: Manually tested to see that the error can no longer be repro'd. Change-Id: I1cfb5bd68c6568e304bb55064794aa0e09075d56 (cherry picked from commit 2843c5bf634b02f0e634659f9c88a5de9a309ac8) Merged-In: I1cfb5bd68c6568e304bb55064794aa0e09075d56
2023-02-13Fix error prone of AccessibilityShortcutControllerTestmenghanli
Bug: 260261870 Test: Build & atest AccessibilityShortcutControllerTest Change-Id: I22738576dfa0231b45fd0dcc87fd63272379170e (cherry picked from commit 93294daadb6476356249f5ee6e106d369f6d51f0) Merged-In: I22738576dfa0231b45fd0dcc87fd63272379170e
2023-02-13Avoid users add one-handed mode by edit shortcut dialog in unsupported devicesmenghanli
Root cause: We show preinstalled framework features in edit shortcut dialog Solution: Only show one-handed mode if the device supports Bug: 260182478 Test: atest AccessibilityTargetHelperTest Change-Id: Id0696bff522cb7e19c5a16a47bbb76a794472c52 merged-in: Id0696bff522cb7e19c5a16a47bbb76a794472c52 (cherry picked from commit 1a9081a982970d812676a3ee3e3aa7fe27f3b449) (cherry picked from commit e30a26970eef3a64009f7692c1cf31c5aceafbc1) Merged-In: Id0696bff522cb7e19c5a16a47bbb76a794472c52
2023-02-10Merge cherrypicks of ['googleplex-android-review.googlesource.com/21305722', ↵Android Build Coastguard Worker
'googleplex-android-review.googlesource.com/21349142'] into tm-d2-release. Change-Id: Ib06dfb6b64074dff481ab06a4669c0e0aaa8951c
2023-02-10Fixes to remove controls for tabletFabian Kozynski
These fixes are needed in order for the following: * No part of the controls tree is accessible when the flag is off * The tile comes back once the flag is on Test: manually flash changing handheld_core_hardware.xml Test: atest AutoTileManagerTest DeviceControlsControllerImplTest Bug: 268204890 Change-Id: I030ecbbf77feef0f342826d568210ac24bd2c141 (cherry picked from commit 96d365d5b1931e2c5fe61590dca1c79d1ae052d3) Merged-In: I030ecbbf77feef0f342826d568210ac24bd2c141
2023-02-10Release doze lock when the dream component changesGalia Peycheva
Bug: 260094933 Bug: 266937746 Test: m Change-Id: Ia46f1e91469886bb562860ff81385928dd718ef7 (cherry picked from commit e85f0e12079e32244ce25ed57b595409c30a0051) Merged-In: Ia46f1e91469886bb562860ff81385928dd718ef7
2023-02-09Merge cherrypicks of ['googleplex-android-review.googlesource.com/21337828', ↵Android Build Coastguard Worker
'googleplex-android-review.googlesource.com/21318741', 'googleplex-android-review.googlesource.com/21330999'] into tm-d2-release. Change-Id: Ib0993de1df2d4d1da0fa0af965936285706216aa
2023-02-09Fix incorrect behavior of back button in kids modeShawn Lin
Previously, we created a root task with its size excluded the nav bar for kids mode and put all tasks in this root task execpt for HOME task since the kids mode team want the kids launcher to be fullscreen. The issue can be reproduced as following steps: 1. Task Hierarchy when Start App1 - Kid's Root Task - App1 Task - Home 2. Task Hierarchy when Start home - Home - Kid's Root Task - App1 Task 3. Task Hierarchy when Start App2 - Kid's Root Task - App2 Task - App1 Task - Home 4. Task Hierarchy when user press BACK key. The App1 task will be brought to front instead of Home - Kid's Root Task - App1 Task - App2 Task - Home Solution: We now also put HOME task in the root task but set it's bounds to fullscreen size and set the window crop of the root task to fullscreen size so that HOME task can extend to fullscreen size. Bug: 266507175 Test: 1. launch app1 and press Home 2. launch app2 and press Back 3. Home should be brought to front Change-Id: Ic6d5f65f277a4b73062d51fc67dcc300ab1ce15b (cherry picked from commit 24b2a01c506de96c744f132bb7e0d6cec729fc38) Merged-In: Ic6d5f65f277a4b73062d51fc67dcc300ab1ce15b
2023-02-09[6/n] Camera Compat: Fix the toast gating condition.Mariia Sandrikova
Before this change, the toast was shown for all activities that have active camera connection. Now it is limited to activities with fixed orientation that are eligible for force rotation. Test: atest WmTests:DisplayRotationCompatPolicyTests Fix: 267763989 Change-Id: Ic5774f70f7c74d26d2242e4849e3383b8b62d489 (cherry picked from commit 3e7f0dc19cdad099ad53a904cc15f32109e431b5) Merged-In: Ic5774f70f7c74d26d2242e4849e3383b8b62d489