summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-05-18[coastguard skipped] Merge sparse cherrypicks from ↵android-13.0.0_r54android-13.0.0_r52android13-qpr3-s2-releaseAndroid Build Coastguard Worker
sparse-10161073-L49900000960778179 into tm-qpr3-release. COASTGUARD_SKIP: I9fb0d66327f3f872a92e6b9d682d58489e81e6ba COASTGUARD_SKIP: I169a1f72c84528ca606b6a4da165d4fbcd02b08d COASTGUARD_SKIP: I30579090c803b231fd750abbc4ad645805f7ece2 COASTGUARD_SKIP: Id53c6a2aa6da5933d488ca06a0bfc4ef89a4c343 COASTGUARD_SKIP: I9582a0401532e221bf2c720be71a3796324b8bbf COASTGUARD_SKIP: I7d3d35df0ec38945019f71755bed8797b7af4517 COASTGUARD_SKIP: Id302c41f63028bc6dd58ba686e23d73565de9675 COASTGUARD_SKIP: I5d329beecef1902c36704e93d0bc5cb60d0e2f5b COASTGUARD_SKIP: I83429f9e63e51c615a6e3f03befb76bb5b8ea7fc COASTGUARD_SKIP: I2617de6f9e8a7dbfd8fbeff589a7d592f00d87c5 COASTGUARD_SKIP: I848545f7aee202495c515f47a32871a2cb6ae707 COASTGUARD_SKIP: I7a725647c001062d1a76a82b680a02e3e2edcb03 Change-Id: I26415a2ad492e238fe8253540dea6b3470a06a69
2023-05-18Merge cherrypicks of ['googleplex-android-review.googlesource.com/20219552', ↵Android Build Coastguard Worker
'googleplex-android-review.googlesource.com/20946190', 'googleplex-android-review.googlesource.com/22616881', 'googleplex-android-review.googlesource.com/21327525', 'googleplex-android-review.googlesource.com/22621774', 'googleplex-android-review.googlesource.com/22905438', 'googleplex-android-review.googlesource.com/17738545', 'googleplex-android-review.googlesource.com/21253698', 'googleplex-android-review.googlesource.com/22787457', 'googleplex-android-review.googlesource.com/22512482', 'googleplex-android-review.googlesource.com/22895638'] into sparse-10161073-L49900000960778179. SPARSE_CHANGE: Id53c6a2aa6da5933d488ca06a0bfc4ef89a4c343 SPARSE_CHANGE: I9fb0d66327f3f872a92e6b9d682d58489e81e6ba SPARSE_CHANGE: I83429f9e63e51c615a6e3f03befb76bb5b8ea7fc SPARSE_CHANGE: I5d329beecef1902c36704e93d0bc5cb60d0e2f5b SPARSE_CHANGE: Id302c41f63028bc6dd58ba686e23d73565de9675 SPARSE_CHANGE: I2617de6f9e8a7dbfd8fbeff589a7d592f00d87c5 SPARSE_CHANGE: I7a725647c001062d1a76a82b680a02e3e2edcb03 SPARSE_CHANGE: I30579090c803b231fd750abbc4ad645805f7ece2 SPARSE_CHANGE: I848545f7aee202495c515f47a32871a2cb6ae707 SPARSE_CHANGE: I169a1f72c84528ca606b6a4da165d4fbcd02b08d SPARSE_CHANGE: I7d3d35df0ec38945019f71755bed8797b7af4517 Change-Id: I9582a0401532e221bf2c720be71a3796324b8bbf
2023-05-18Visit URIs in landscape/portrait custom remote views.Ioana Alexandru
Bug: 277740848 Test: atest RemoteViewsTest NotificationManagerServiceTest & tested with POC from bug (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:b4692946c10d11c1e935869e11dc709a9cdcba69) Merged-In: I7d3d35df0ec38945019f71755bed8797b7af4517 Change-Id: I7d3d35df0ec38945019f71755bed8797b7af4517
2023-05-18[RESTRICT AUTOMERGE] Prevent installing apps in policy restricted work ↵Sumedh Sen
profile using ADB If DISALLOW_DEBUGGING_FEATURES or DISALLOW_INSTALL_APPS restrictions are set on a work profile, prevent side loading of APKs using ADB in the work profile. Bug: 257443065 Test: atest CtsPackageInstallTestCases:UserRestrictionInstallTest (cherry picked from commit febe3918020a94b2af48ade98eb6a49cdd4a3bdf) (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:b988a09db551d9a8b2aeb0e8eb88e610605709e8) Merged-In: I169a1f72c84528ca606b6a4da165d4fbcd02b08d Change-Id: I169a1f72c84528ca606b6a4da165d4fbcd02b08d
2023-05-18Verify URI permissions for EXTRA_REMOTE_INPUT_HISTORY_ITEMS.Ioana Alexandru
Also added the person URIs in the test, since they weren't being checked. Test: atest NotificationManagerServiceTest & tested with POC from bug Bug: 276729064 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:43b1711332763788c7abf05c3baa931296c45bbb) Merged-In: I848545f7aee202495c515f47a32871a2cb6ae707 Change-Id: I848545f7aee202495c515f47a32871a2cb6ae707
2023-05-18[1-time permissions] Use internal api to check proc statesEvan Severson
We need to check the proc state and the binder method has a filter that is affected by a bug that keeps a killed a proces in the "pending top" list. Using the internal api isn't affected by this filter and also is more correct for inprocess calls. Test: Install test app that requests permission and will exit immediately on granting, observe permission is no longer indefinitely held. Bug: 254736794 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:e836611f3057cf9eae589a34a39fe80d0a9145f3) Merged-In: I30579090c803b231fd750abbc4ad645805f7ece2 Change-Id: I30579090c803b231fd750abbc4ad645805f7ece2
2023-05-18Watch uid proc state instead of importance for 1-time permissionsEvan Severson
The system process may bind to an app with the flag BIND_FOREGROUND_SERVICE, this will put the client in the foreground service importance level without the normal requirement that foreground services must show a notification. Looking at proc states instead allows us to differentiate between these two levels of foreground service and revoke the client when not in use. This change makes the parameters `importanceToResetTimer` and `importanceToKeepSessionAlive` in PermissionManager#startOneTimePermissionSession obsolete. Test: atest CtsPermissionTestCases + manual testing with mic/cam/loc Bug: 217981062 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:0be78fbbf7d92bf29858aa0c48b171045ab5057f) Merged-In: I7a725647c001062d1a76a82b680a02e3e2edcb03 Change-Id: I7a725647c001062d1a76a82b680a02e3e2edcb03
2023-05-18Truncate ShortcutInfo IdAndrás Kurucz
Creating Conversation with a ShortcutId longer than 65_535 (max unsigned short), we did not save the conversation settings into the notification_policy.xml due to a restriction in FastDataOutput. This put us to a state where the user changing the importance or turning off the notifications for the given conversation had no effect on notification behavior. Fixes: 273729476 Test: atest ShortcutManagerTest2 Test: Create a test app which creates a Conversation with a long shortcutId. Go to the Conversation Settings and turn off Notifications. Post a new Notification to this Conversation and see if it is displayed. (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:8a5223fcd59e805da510c31c5f8462c5d01ec6d5) Merged-In: I2617de6f9e8a7dbfd8fbeff589a7d592f00d87c5 Change-Id: I2617de6f9e8a7dbfd8fbeff589a7d592f00d87c5
2023-05-18Dismiss keyguard when simpin auth'd and...Aaron Liu
security method is none. This is mostly to fix the case where we auth sim pin in the set up wizard and it goes straight to keyguard instead of the setup wizard activity. This works with the prevent bypass keyguard flag because the device should be noe secure in this case. Fixes: 222446076 Test: turn locked sim on, which opens the sim pin screen. Auth the screen and observe that keyguard is not shown. (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:48fa9bef3451e4a358c941af5b230f99881c5cb6) Cherry-picking this CL as a security fix Bug: 222446076 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:65ea56f54c059584eb27ec53d486dba8161316ab) Merged-In: Id302c41f63028bc6dd58ba686e23d73565de9675 Change-Id: Id302c41f63028bc6dd58ba686e23d73565de9675
2023-05-18Only allow NEW_TASK flag when adjusting pending intentsWinson Chung
Bug: 243794108 Test: atest CtsSecurityBulletinHostTestCases:android.security.cts.CVE_2023_20918 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:c62d2e1021a030f4f0ae5fcfc8fe8e0875fa669f) Merged-In: I5d329beecef1902c36704e93d0bc5cb60d0e2f5b Change-Id: I5d329beecef1902c36704e93d0bc5cb60d0e2f5b
2023-05-18Grant URI permissions to the CallStyle-related onesMatías Hernández
This will also verify that the caller app can actually grant them. Fix: 274592467 Test: atest NotificationManagerServiceTest (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:4dee5aab12e95cd8b4d663ad050f07b0f2433596) Merged-In: I83429f9e63e51c615a6e3f03befb76bb5b8ea7fc Change-Id: I83429f9e63e51c615a6e3f03befb76bb5b8ea7fc
2023-05-18Revert "Ensure that only SysUI can override pending intent launch flags"Winson Chung
This reverts commit c4d3106e347922610f8c554de3ae238175ed393e. Reason for revert: b/264884187, b/264885689 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:48acfb0f1d71912e757cadd505901471c1df4d4c) Merged-In: I9fb0d66327f3f872a92e6b9d682d58489e81e6ba Change-Id: I9fb0d66327f3f872a92e6b9d682d58489e81e6ba
2023-05-18Ensure that only SysUI can override pending intent launch flagsWinson Chung
- Originally added in ag/5139951, this method ensured that activities launched from widgets are always started in a new task (if the activity is launched in the home task, the task is not brough forward with the recents transition). We can restrict this to only recents callers since this only applies to 1p launchers in gesture nav (both the gesture with 3p launchers and button nav in general will always start the home intent directly, which makes adding the NEW_TASK flag unnecessary). Bug: 243794108 Test: Ensure that the original bug b/112508020 still works (with the test app in the bug, swipe up still works after launching an activity from the widget, and fails without applying the override flags) (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:c4d3106e347922610f8c554de3ae238175ed393e) Merged-In: Id53c6a2aa6da5933d488ca06a0bfc4ef89a4c343 Change-Id: Id53c6a2aa6da5933d488ca06a0bfc4ef89a4c343
2023-05-18[coastguard skipped] Merge sparse cherrypicks from ↵Android Build Coastguard Worker
sparse-10161073-L38600000960763138 into tm-qpr3-release. COASTGUARD_SKIP: Ibf9a457338c6e9ba8c275de09a4c2196ccbc2f35 COASTGUARD_SKIP: I83429f9e63e51c615a6e3f03befb76bb5b8ea7fc COASTGUARD_SKIP: I5d329beecef1902c36704e93d0bc5cb60d0e2f5b COASTGUARD_SKIP: I2617de6f9e8a7dbfd8fbeff589a7d592f00d87c5 COASTGUARD_SKIP: Id53c6a2aa6da5933d488ca06a0bfc4ef89a4c343 COASTGUARD_SKIP: I848545f7aee202495c515f47a32871a2cb6ae707 COASTGUARD_SKIP: I169a1f72c84528ca606b6a4da165d4fbcd02b08d COASTGUARD_SKIP: I7d3d35df0ec38945019f71755bed8797b7af4517 COASTGUARD_SKIP: Id302c41f63028bc6dd58ba686e23d73565de9675 COASTGUARD_SKIP: I8eb890fd2e5797d8d6ab5b12f9c628bc9616081d COASTGUARD_SKIP: I30579090c803b231fd750abbc4ad645805f7ece2 COASTGUARD_SKIP: I7a725647c001062d1a76a82b680a02e3e2edcb03 COASTGUARD_SKIP: I9fb0d66327f3f872a92e6b9d682d58489e81e6ba Change-Id: I041e2fb4e46cc789346e77912da5bed8d54b09c1
2023-05-18Merge cherrypicks of ['googleplex-android-review.googlesource.com/20219552', ↵Android Build Coastguard Worker
'googleplex-android-review.googlesource.com/20946190', 'googleplex-android-review.googlesource.com/20460002', 'googleplex-android-review.googlesource.com/22616881', 'googleplex-android-review.googlesource.com/21327525', 'googleplex-android-review.googlesource.com/22621774', 'googleplex-android-review.googlesource.com/22905438', 'googleplex-android-review.googlesource.com/17738545', 'googleplex-android-review.googlesource.com/21253698', 'googleplex-android-review.googlesource.com/22787457', 'googleplex-android-review.googlesource.com/22512482', 'googleplex-android-review.googlesource.com/22895638'] into sparse-10161073-L38600000960763138. SPARSE_CHANGE: Id53c6a2aa6da5933d488ca06a0bfc4ef89a4c343 SPARSE_CHANGE: I9fb0d66327f3f872a92e6b9d682d58489e81e6ba SPARSE_CHANGE: I8eb890fd2e5797d8d6ab5b12f9c628bc9616081d SPARSE_CHANGE: I83429f9e63e51c615a6e3f03befb76bb5b8ea7fc SPARSE_CHANGE: I5d329beecef1902c36704e93d0bc5cb60d0e2f5b SPARSE_CHANGE: Id302c41f63028bc6dd58ba686e23d73565de9675 SPARSE_CHANGE: I2617de6f9e8a7dbfd8fbeff589a7d592f00d87c5 SPARSE_CHANGE: I7a725647c001062d1a76a82b680a02e3e2edcb03 SPARSE_CHANGE: I30579090c803b231fd750abbc4ad645805f7ece2 SPARSE_CHANGE: I848545f7aee202495c515f47a32871a2cb6ae707 SPARSE_CHANGE: I169a1f72c84528ca606b6a4da165d4fbcd02b08d SPARSE_CHANGE: I7d3d35df0ec38945019f71755bed8797b7af4517 Change-Id: Ibf9a457338c6e9ba8c275de09a4c2196ccbc2f35
2023-05-18Visit URIs in landscape/portrait custom remote views.Ioana Alexandru
Bug: 277740848 Test: atest RemoteViewsTest NotificationManagerServiceTest & tested with POC from bug (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:b4692946c10d11c1e935869e11dc709a9cdcba69) Merged-In: I7d3d35df0ec38945019f71755bed8797b7af4517 Change-Id: I7d3d35df0ec38945019f71755bed8797b7af4517
2023-05-18[RESTRICT AUTOMERGE] Prevent installing apps in policy restricted work ↵Sumedh Sen
profile using ADB If DISALLOW_DEBUGGING_FEATURES or DISALLOW_INSTALL_APPS restrictions are set on a work profile, prevent side loading of APKs using ADB in the work profile. Bug: 257443065 Test: atest CtsPackageInstallTestCases:UserRestrictionInstallTest (cherry picked from commit febe3918020a94b2af48ade98eb6a49cdd4a3bdf) (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:b988a09db551d9a8b2aeb0e8eb88e610605709e8) Merged-In: I169a1f72c84528ca606b6a4da165d4fbcd02b08d Change-Id: I169a1f72c84528ca606b6a4da165d4fbcd02b08d
2023-05-18Verify URI permissions for EXTRA_REMOTE_INPUT_HISTORY_ITEMS.Ioana Alexandru
Also added the person URIs in the test, since they weren't being checked. Test: atest NotificationManagerServiceTest & tested with POC from bug Bug: 276729064 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:43b1711332763788c7abf05c3baa931296c45bbb) Merged-In: I848545f7aee202495c515f47a32871a2cb6ae707 Change-Id: I848545f7aee202495c515f47a32871a2cb6ae707
2023-05-18[1-time permissions] Use internal api to check proc statesEvan Severson
We need to check the proc state and the binder method has a filter that is affected by a bug that keeps a killed a proces in the "pending top" list. Using the internal api isn't affected by this filter and also is more correct for inprocess calls. Test: Install test app that requests permission and will exit immediately on granting, observe permission is no longer indefinitely held. Bug: 254736794 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:e836611f3057cf9eae589a34a39fe80d0a9145f3) Merged-In: I30579090c803b231fd750abbc4ad645805f7ece2 Change-Id: I30579090c803b231fd750abbc4ad645805f7ece2
2023-05-18Watch uid proc state instead of importance for 1-time permissionsEvan Severson
The system process may bind to an app with the flag BIND_FOREGROUND_SERVICE, this will put the client in the foreground service importance level without the normal requirement that foreground services must show a notification. Looking at proc states instead allows us to differentiate between these two levels of foreground service and revoke the client when not in use. This change makes the parameters `importanceToResetTimer` and `importanceToKeepSessionAlive` in PermissionManager#startOneTimePermissionSession obsolete. Test: atest CtsPermissionTestCases + manual testing with mic/cam/loc Bug: 217981062 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:0be78fbbf7d92bf29858aa0c48b171045ab5057f) Merged-In: I7a725647c001062d1a76a82b680a02e3e2edcb03 Change-Id: I7a725647c001062d1a76a82b680a02e3e2edcb03
2023-05-18Truncate ShortcutInfo IdAndrás Kurucz
Creating Conversation with a ShortcutId longer than 65_535 (max unsigned short), we did not save the conversation settings into the notification_policy.xml due to a restriction in FastDataOutput. This put us to a state where the user changing the importance or turning off the notifications for the given conversation had no effect on notification behavior. Fixes: 273729476 Test: atest ShortcutManagerTest2 Test: Create a test app which creates a Conversation with a long shortcutId. Go to the Conversation Settings and turn off Notifications. Post a new Notification to this Conversation and see if it is displayed. (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:8a5223fcd59e805da510c31c5f8462c5d01ec6d5) Merged-In: I2617de6f9e8a7dbfd8fbeff589a7d592f00d87c5 Change-Id: I2617de6f9e8a7dbfd8fbeff589a7d592f00d87c5
2023-05-18Dismiss keyguard when simpin auth'd and...Aaron Liu
security method is none. This is mostly to fix the case where we auth sim pin in the set up wizard and it goes straight to keyguard instead of the setup wizard activity. This works with the prevent bypass keyguard flag because the device should be noe secure in this case. Fixes: 222446076 Test: turn locked sim on, which opens the sim pin screen. Auth the screen and observe that keyguard is not shown. (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:48fa9bef3451e4a358c941af5b230f99881c5cb6) Cherry-picking this CL as a security fix Bug: 222446076 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:65ea56f54c059584eb27ec53d486dba8161316ab) Merged-In: Id302c41f63028bc6dd58ba686e23d73565de9675 Change-Id: Id302c41f63028bc6dd58ba686e23d73565de9675
2023-05-18Only allow NEW_TASK flag when adjusting pending intentsWinson Chung
Bug: 243794108 Test: atest CtsSecurityBulletinHostTestCases:android.security.cts.CVE_2023_20918 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:c62d2e1021a030f4f0ae5fcfc8fe8e0875fa669f) Merged-In: I5d329beecef1902c36704e93d0bc5cb60d0e2f5b Change-Id: I5d329beecef1902c36704e93d0bc5cb60d0e2f5b
2023-05-18Grant URI permissions to the CallStyle-related onesMatías Hernández
This will also verify that the caller app can actually grant them. Fix: 274592467 Test: atest NotificationManagerServiceTest (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:4dee5aab12e95cd8b4d663ad050f07b0f2433596) Merged-In: I83429f9e63e51c615a6e3f03befb76bb5b8ea7fc Change-Id: I83429f9e63e51c615a6e3f03befb76bb5b8ea7fc
2023-05-18Sanitize VPN label to prevent HTML injectionLucas Lin
This commit will try to sanitize the content of VpnDialog. This commit creates a function which will try to sanitize the VPN label, if the sanitized VPN label is different from the original one, which means the VPN label might contain HTML tag or the VPN label violates the words restriction(may contain some wording which will mislead the user). For this kind of case, show the package name instead of the VPN label to prevent misleading the user. The malicious VPN app might be able to add a large number of line breaks with HTML in order to hide the system-displayed text from the user in the connection request dialog. Thus, sanitizing the content of the dialog is needed. Bug: 204554636 Test: N/A (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2178216b98bf9865edee198f45192f0b883624ab) Merged-In: I8eb890fd2e5797d8d6ab5b12f9c628bc9616081d Change-Id: I8eb890fd2e5797d8d6ab5b12f9c628bc9616081d
2023-05-18Revert "Ensure that only SysUI can override pending intent launch flags"Winson Chung
This reverts commit c4d3106e347922610f8c554de3ae238175ed393e. Reason for revert: b/264884187, b/264885689 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:48acfb0f1d71912e757cadd505901471c1df4d4c) Merged-In: I9fb0d66327f3f872a92e6b9d682d58489e81e6ba Change-Id: I9fb0d66327f3f872a92e6b9d682d58489e81e6ba
2023-05-18Ensure that only SysUI can override pending intent launch flagsWinson Chung
- Originally added in ag/5139951, this method ensured that activities launched from widgets are always started in a new task (if the activity is launched in the home task, the task is not brough forward with the recents transition). We can restrict this to only recents callers since this only applies to 1p launchers in gesture nav (both the gesture with 3p launchers and button nav in general will always start the home intent directly, which makes adding the NEW_TASK flag unnecessary). Bug: 243794108 Test: Ensure that the original bug b/112508020 still works (with the test app in the bug, swipe up still works after launching an activity from the widget, and fails without applying the override flags) (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:c4d3106e347922610f8c554de3ae238175ed393e) Merged-In: Id53c6a2aa6da5933d488ca06a0bfc4ef89a4c343 Change-Id: Id53c6a2aa6da5933d488ca06a0bfc4ef89a4c343
2023-05-10[coastguard skipped] Merge sparse cherrypicks from ↵android-13.0.0_r53android-13.0.0_r51android-13.0.0_r50android13-qpr3-s1-releaseAndroid Build Coastguard Worker
sparse-10099262-L86600000960563267 into tm-qpr3-release. COASTGUARD_SKIP: I62e829555c43136080ee4909f7dcf8c388165e9f COASTGUARD_SKIP: Ic7b1c4b40960fd04de9efbf4f6d7abee45c93025 COASTGUARD_SKIP: I35ba4652a125c8c83e18138f0fb0a51f3ef65b73 COASTGUARD_SKIP: If333e1f0e70f3ac79663474de4417017bca30310 COASTGUARD_SKIP: Ib4eef40a0f59512c669b069532e55d36293f9e1c COASTGUARD_SKIP: I2bfdc7801cec1b3aaa44f841d8a821214c6cb801 COASTGUARD_SKIP: I98618477a828eb72b2173af6988e804471139e81 COASTGUARD_SKIP: I1c51c6f66cd6967651068de1ffc2e6e8566f5a46 Change-Id: I6b1fd860fb37c0a3b70659f7127104fe5c7bd672
2023-05-10Merge cherrypicks of ['googleplex-android-review.googlesource.com/23053887', ↵android-13.0.0_r56android13-qpr3-s3-releaseAndroid Build Coastguard Worker
'googleplex-android-review.googlesource.com/23054378', 'googleplex-android-review.googlesource.com/22733606', 'googleplex-android-review.googlesource.com/22912038', 'googleplex-android-review.googlesource.com/22915981', 'googleplex-android-review.googlesource.com/23048037', 'googleplex-android-review.googlesource.com/23103421'] into sparse-10099262-L86600000960563267. SPARSE_CHANGE: I98618477a828eb72b2173af6988e804471139e81 SPARSE_CHANGE: Ic7b1c4b40960fd04de9efbf4f6d7abee45c93025 SPARSE_CHANGE: I1c51c6f66cd6967651068de1ffc2e6e8566f5a46 SPARSE_CHANGE: I35ba4652a125c8c83e18138f0fb0a51f3ef65b73 SPARSE_CHANGE: I2bfdc7801cec1b3aaa44f841d8a821214c6cb801 SPARSE_CHANGE: I62e829555c43136080ee4909f7dcf8c388165e9f SPARSE_CHANGE: Ib4eef40a0f59512c669b069532e55d36293f9e1c Change-Id: If333e1f0e70f3ac79663474de4417017bca30310
2023-05-10Invalidate buffers on transform changeJohn Reck
Fixes: 271419600 Test: repro steps on bug (cherry picked from commit 61c64472417a272ec2aa2fd38e0d1874dbf16319) (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:5545b1cc36fd47bb33d87875b451f9f5c870d8bf) Merged-In: Ib4eef40a0f59512c669b069532e55d36293f9e1c Change-Id: Ib4eef40a0f59512c669b069532e55d36293f9e1c
2023-05-10Improve first opaque activity candidate detectionMassimo Carli
To catch the right candidate as first opaque activity beneath a translucent one and handle normal permission dialog behaviour and smart links. Fixes: 278661668 Test: Run `atest WmTests:SizeCompatTests` (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:bcf680d064ea8921091bfc4620b6958adf79e8a2) Merged-In: I62e829555c43136080ee4909f7dcf8c388165e9f Change-Id: I62e829555c43136080ee4909f7dcf8c388165e9f
2023-05-10DO NOT MERGE Hide EmptyShadeView when on bouncerShawn Lee
Added a check to make sure EmptyShadeView is hidden when bouncer is showing. Bug: 267060171 Test: manually verified EmptyShadeView visibility (cherry picked from commit bef2be6757eec92391189c106e89b63176cd16c0) (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2e640447d16c4e893927e2f76bda8b1073bb18f8) Merged-In: I2bfdc7801cec1b3aaa44f841d8a821214c6cb801 Change-Id: I2bfdc7801cec1b3aaa44f841d8a821214c6cb801
2023-05-10DO NOT MERGE Adding tests for updated EmptyShadeView logicShawn Lee
Tests for ag/22688474 Bug: 267060171 Test: tests run (cherry picked from commit 6a19675b120b497618259cbcdedde4ffb68389c8) (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:e6fe1a0ef1ebb9123f4ed943c8470a873efbaada) Merged-In: I35ba4652a125c8c83e18138f0fb0a51f3ef65b73 Change-Id: I35ba4652a125c8c83e18138f0fb0a51f3ef65b73
2023-05-10Prevent force showing system bars for TaskViewJerry Chang
Update the condition of force showing system bars to check adjacent tasks instead of checking multi-window windowing mode so it can distinguish from TaskView. Bug: 273495037 Test: atest TaskDisplayAreaTests DisplayPolicyTests InsetsPolicyTest (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2bd0fe76a6b4ef566386e1949e4db0cf0db16430) Merged-In: I1c51c6f66cd6967651068de1ffc2e6e8566f5a46 Change-Id: I1c51c6f66cd6967651068de1ffc2e6e8566f5a46
2023-05-10Skip letterboxing if the activity below is embeddedLouis Chang
Embedded activities are resize-able and won't be letterboxed Bug: 270681405 fixes: 280898266 Test: SizeCompatTests Test: manual - repro step in bug (cherry picked from commit b828087bbc1bfead31a9a4e2f54b162d04a10172) (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:ad7d89c22bf53fbcfd1f8d5a1ae2c611c376e9b3) Merged-In: Ic7b1c4b40960fd04de9efbf4f6d7abee45c93025 Change-Id: Ic7b1c4b40960fd04de9efbf4f6d7abee45c93025
2023-05-10Unfreeze the surface when the transition is doneLouis Chang
The surface was not unfreeze if the WindowContainer is closing and changing after [1]. Always check and unfreeze the surface if needed when the transition is done. [1] d19ad2aa09fd27ec11e626ab239babb929c32fd6 Bug: 280754787 Test: click web link on chat while having a Meet call (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:f3a5c5892402916ca861c41319f21acb83bd1f83) Merged-In: I98618477a828eb72b2173af6988e804471139e81 Change-Id: I98618477a828eb72b2173af6988e804471139e81
2023-04-28[coastguard skipped] Merge sparse cherrypicks from ↵Android Build Coastguard Worker
sparse-10025418-L15100000960301099 into tm-qpr3-release. COASTGUARD_SKIP: If4b2156fe647ff95b3b6be9757aab5f91e4eed89 COASTGUARD_SKIP: I2bfdc7801cec1b3aaa44f841d8a821214c6cb801 COASTGUARD_SKIP: I35ba4652a125c8c83e18138f0fb0a51f3ef65b73 COASTGUARD_SKIP: I1c51c6f66cd6967651068de1ffc2e6e8566f5a46 Change-Id: I6d12e295e90dcce1d0fdce03fb622dac67c1b233
2023-04-28Merge cherrypicks of ['googleplex-android-review.googlesource.com/22733606', ↵Android Build Coastguard Worker
'googleplex-android-review.googlesource.com/22912038', 'googleplex-android-review.googlesource.com/22915981'] into sparse-10025418-L15100000960301099. SPARSE_CHANGE: I1c51c6f66cd6967651068de1ffc2e6e8566f5a46 SPARSE_CHANGE: I35ba4652a125c8c83e18138f0fb0a51f3ef65b73 SPARSE_CHANGE: I2bfdc7801cec1b3aaa44f841d8a821214c6cb801 Change-Id: If4b2156fe647ff95b3b6be9757aab5f91e4eed89
2023-04-28DO NOT MERGE Hide EmptyShadeView when on bouncerShawn Lee
Added a check to make sure EmptyShadeView is hidden when bouncer is showing. Bug: 267060171 Test: manually verified EmptyShadeView visibility (cherry picked from commit bef2be6757eec92391189c106e89b63176cd16c0) (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2e640447d16c4e893927e2f76bda8b1073bb18f8) Merged-In: I2bfdc7801cec1b3aaa44f841d8a821214c6cb801 Change-Id: I2bfdc7801cec1b3aaa44f841d8a821214c6cb801
2023-04-28DO NOT MERGE Adding tests for updated EmptyShadeView logicShawn Lee
Tests for ag/22688474 Bug: 267060171 Test: tests run (cherry picked from commit 6a19675b120b497618259cbcdedde4ffb68389c8) (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:e6fe1a0ef1ebb9123f4ed943c8470a873efbaada) Merged-In: I35ba4652a125c8c83e18138f0fb0a51f3ef65b73 Change-Id: I35ba4652a125c8c83e18138f0fb0a51f3ef65b73
2023-04-28Prevent force showing system bars for TaskViewJerry Chang
Update the condition of force showing system bars to check adjacent tasks instead of checking multi-window windowing mode so it can distinguish from TaskView. Bug: 273495037 Test: atest TaskDisplayAreaTests DisplayPolicyTests InsetsPolicyTest (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2bd0fe76a6b4ef566386e1949e4db0cf0db16430) Merged-In: I1c51c6f66cd6967651068de1ffc2e6e8566f5a46 Change-Id: I1c51c6f66cd6967651068de1ffc2e6e8566f5a46
2023-04-27Merge cherrypicks of ['googleplex-android-review.googlesource.com/22815560'] ↵Android Build Coastguard Worker
into tm-qpr3-release. Change-Id: I5570c93c08339d78cf0b66909d62a4bddfcfad2c
2023-04-27Don't show home controls complication if not available.Lucas Silva
There is a toggle to disable home controls in Settings, and we need to honor that toggle when determining if the complication should be shown on the dream. Bug: 278964460 Test: atest DreamOverlayStateControllerTest Test: flashed device and disabled toggle in settings, verified home controls does not show on clock dream (cherry picked from commit 2955b163175b3dbdf69df34ea0c6f8c8c40642d3) (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:f7cf03045f46a10d1cdb0f0c0134cb06ad2c44e7) Merged-In: I4e72f4619fd0ebbf5a78620796f0114ceabc9365 Change-Id: I4e72f4619fd0ebbf5a78620796f0114ceabc9365
2023-04-26[coastguard skipped] Merge sparse cherrypicks from ↵Android Build Coastguard Worker
sparse-9991837-L83700000960209120 into tm-qpr3-release. COASTGUARD_SKIP: Ife0b57ca76f80fec4935b23edbd990355ef111a6 COASTGUARD_SKIP: I1c51c6f66cd6967651068de1ffc2e6e8566f5a46 COASTGUARD_SKIP: I35ba4652a125c8c83e18138f0fb0a51f3ef65b73 COASTGUARD_SKIP: I2bfdc7801cec1b3aaa44f841d8a821214c6cb801 Change-Id: Ice4302bcda30fd15ef19583ad0cf14e5ceac5118
2023-04-26Merge cherrypicks of ['googleplex-android-review.googlesource.com/22688474', ↵Android Build Coastguard Worker
'googleplex-android-review.googlesource.com/22721990', 'googleplex-android-review.googlesource.com/22733606'] into sparse-9991837-L83700000960209120. SPARSE_CHANGE: I2bfdc7801cec1b3aaa44f841d8a821214c6cb801 SPARSE_CHANGE: I35ba4652a125c8c83e18138f0fb0a51f3ef65b73 SPARSE_CHANGE: I1c51c6f66cd6967651068de1ffc2e6e8566f5a46 Change-Id: Ife0b57ca76f80fec4935b23edbd990355ef111a6
2023-04-26Prevent force showing system bars for TaskViewJerry Chang
Update the condition of force showing system bars to check adjacent tasks instead of checking multi-window windowing mode so it can distinguish from TaskView. Bug: 273495037 Test: atest TaskDisplayAreaTests DisplayPolicyTests InsetsPolicyTest (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2bd0fe76a6b4ef566386e1949e4db0cf0db16430) Merged-In: I1c51c6f66cd6967651068de1ffc2e6e8566f5a46 Change-Id: I1c51c6f66cd6967651068de1ffc2e6e8566f5a46
2023-04-26Adding tests for updated EmptyShadeView logicShawn Lee
Tests for ag/22688474 Bug: 267060171 Test: tests run (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:6a19675b120b497618259cbcdedde4ffb68389c8) Merged-In: I35ba4652a125c8c83e18138f0fb0a51f3ef65b73 Change-Id: I35ba4652a125c8c83e18138f0fb0a51f3ef65b73
2023-04-26Hide EmptyShadeView when on bouncerShawn Lee
Added a check to make sure EmptyShadeView is hidden when bouncer is showing. Bug: 267060171 Test: manually verified EmptyShadeView visibility (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:bef2be6757eec92391189c106e89b63176cd16c0) Merged-In: I2bfdc7801cec1b3aaa44f841d8a821214c6cb801 Change-Id: I2bfdc7801cec1b3aaa44f841d8a821214c6cb801
2023-04-25[coastguard skipped] Merge sparse cherrypicks from ↵Android Build Coastguard Worker
sparse-9991837-L20000000960186230 into tm-qpr3-release. COASTGUARD_SKIP: I35ba4652a125c8c83e18138f0fb0a51f3ef65b73 COASTGUARD_SKIP: I96512935c366153ea1c3d023fb730ef1fc827692 COASTGUARD_SKIP: I1c51c6f66cd6967651068de1ffc2e6e8566f5a46 COASTGUARD_SKIP: I2bfdc7801cec1b3aaa44f841d8a821214c6cb801 Change-Id: Ieda8cc253f10714c949c6dadead62ee52ce06445
2023-04-25Merge cherrypicks of ['googleplex-android-review.googlesource.com/22688474', ↵Android Build Coastguard Worker
'googleplex-android-review.googlesource.com/22721990', 'googleplex-android-review.googlesource.com/22733606'] into sparse-9991837-L20000000960186230. SPARSE_CHANGE: I2bfdc7801cec1b3aaa44f841d8a821214c6cb801 SPARSE_CHANGE: I35ba4652a125c8c83e18138f0fb0a51f3ef65b73 SPARSE_CHANGE: I1c51c6f66cd6967651068de1ffc2e6e8566f5a46 Change-Id: I96512935c366153ea1c3d023fb730ef1fc827692