Commit Graph

2471 Commits

Author SHA1 Message Date
Treehugger Robot
3a26a48294 Merge "Add permissions to the shell to allow creation of CTS tests for trust." am: 139e007dc5 am: d9b1d582b4 am: 6ce69e06a3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1955633

Change-Id: Id3401787f19347595c613d637adf2a7e6e09fbd9
2022-01-21 14:09:53 +00:00
Treehugger Robot
6ce69e06a3 Merge "Add permissions to the shell to allow creation of CTS tests for trust." am: 139e007dc5 am: d9b1d582b4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1955633

Change-Id: I51843ba8e7426a0a86f7227acba97051706e86f6
2022-01-21 13:47:08 +00:00
Dave McCloskey
48ae5a7790 Add permissions to the shell to allow creation of CTS tests for trust.
Test: m TrustTestCases in separate CL
Bug: 213631672

Change-Id: Ie215e988eebe4103458b8be4d00698ae1121f75d
2022-01-20 15:48:11 -08:00
Mariia Sandrikova
a274e1a7d4 DO NOT MERGE Revert "[2/n] Camera Compat UI: Add interfaces for client-server..." am: 7617679a61
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16571392

Change-Id: I0adf2bf45c5f7d7349e9c0f180aea9d10f70645d
2022-01-13 22:55:51 +00:00
Mariia Sandrikova
7617679a61 DO NOT MERGE Revert "[2/n] Camera Compat UI: Add interfaces for client-server..."
Revert submission 16468379

Reason for revert: Feature development is moving to T.

Reverted Changes:
Id9b9a8930:[3/n] Camera Compat UI: Add a camera compat contro...
Id6be4a954:Enable a camera app compat control on Large screen...
I083aa6718:[2/n] Camera Compat UI: Add interfaces for client-...

Bug: 206602997

Change-Id: I9ad876043fd61f708a8f468fffd1ef371bfa0866
2022-01-13 15:21:38 +00:00
Mariia Sandrikova
02a17e7b1f Merge changes from topic "camera-compat" into sc-v2-dev am: 3486eacda3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16468379

Change-Id: I1e56abcef9715a3dd6a00d70cb815c4d9260175a
2021-12-18 21:59:31 +00:00
Mariia Sandrikova
24f4d8a952 [2/n] Camera Compat UI: Add interfaces for client-server communication.
Changes:
- Listens to changes from the client coming through IActivityClientController#requestCompatCameraControl to ActivityRecord#updateCameraCompatState
- ActivityRecord#updateCameraCompatState sends updated state via TaskInfo to WM Shell
- ITaskOrganizerController#updateCameraCompatControlState to dispatch the user interactions with the control from WM Shell triggers callback to ActivityRecord#updateCameraCompatStateFromUser
- ActivityRecord#updateCameraCompatStateFromUser remembers the user's choice and asks client to apply treatment through ICompatCameraControlCallback

Feature is guarded with config_isCameraCompatControlForStretchedIssuesEnabled

Test: atest WMShellUnitTests:ShellTaskOrganizerTests, atest WmTests:ActivityRecordTests
Bug: 206602997
Change-Id: I083aa6718bd67456bedd9444e9b78740c041f870
2021-12-17 00:18:57 +00:00
Xin Li
85d715bac3 Merge "Merge Android 12 QPR1" 2021-12-14 20:25:23 +00:00
Alex Buynytskyy
f744fb9e13 Merge "Allow shell/CTS to be package verifier." am: 99ada16f28 am: 6f6c520b90 am: eabf24b25e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1920519

Change-Id: I8a7778440e4a6aab846b3028820d7389fab5287a
2021-12-14 15:29:14 +00:00
Alex Buynytskyy
eabf24b25e Merge "Allow shell/CTS to be package verifier." am: 99ada16f28 am: 6f6c520b90
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1920519

Change-Id: Ia480bbf461f0009eb5573db36d8b0d7f4133eb69
2021-12-14 15:13:46 +00:00
Alex Buynytskyy
6f6c520b90 Merge "Allow shell/CTS to be package verifier." am: 99ada16f28
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1920519

Change-Id: Id62d814b8f3b451d6bb1929218e99300bfbdc7d5
2021-12-14 14:59:43 +00:00
Alex Buynytskyy
b4dc01e32a Allow shell/CTS to be package verifier.
Bug: 204810986
Test: device boots
Test: atest PackageManagerShellCommandTest ChecksumsTest
Change-Id: I0b379714a946c18afdeca4ec02469d26646544df
2021-12-14 01:18:16 +00:00
TreeHugger Robot
99fe2aebdc Merge "CameraServiceProxy: Query recent tasks for top activity data" into sc-v2-dev am: 3a1a4dbf89
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16332393

Change-Id: I065db2bc7e8d2e6490d0a8b18a3c8bf91d39a1da
2021-12-10 19:19:58 +00:00
TreeHugger Robot
3a1a4dbf89 Merge "CameraServiceProxy: Query recent tasks for top activity data" into sc-v2-dev 2021-12-10 18:58:45 +00:00
Emilian Peev
baeaad66d0 CameraServiceProxy: Query recent tasks for top activity data
Certain top activities will not trigger the "onTaskMovedToFront"
callback which can result in incorrect resizeability
queries. This can happen when a new activity is launched in the top
task.
To avoid this, retrieve the necessary information via the reported
recent tasks by activity manager for a given user id.

Bug: 203044281
Test: Manual using camera application

Change-Id: I61efd4282a2231e6354e5514fc25d7d27005335b
2021-12-09 10:16:04 -08:00
Treehugger Robot
3ad0c6ea30 Merge "Add DEVICE_LOCK permission to Shell to support ATS test" am: 00b14576ba am: 8dc3be6249 am: 37643533d3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1909557

Change-Id: Id5cd9e762b69b9edc8ea25d7259939a49b3f81b0
2021-12-03 01:49:04 +00:00
Treehugger Robot
37643533d3 Merge "Add DEVICE_LOCK permission to Shell to support ATS test" am: 00b14576ba am: 8dc3be6249
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1909557

Change-Id: Ica48fc74b73c4d54f39fff315ecd8ffc03989e9a
2021-12-03 01:37:21 +00:00
Treehugger Robot
8dc3be6249 Merge "Add DEVICE_LOCK permission to Shell to support ATS test" am: 00b14576ba
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1909557

Change-Id: I3929ce59312776fb513e9754eb7b24852ca82bbe
2021-12-03 01:14:21 +00:00
Anthony Hugh
b4cce59e37 Add DEVICE_LOCK permission to Shell to support ATS test
Adds DEVICE_LOCK permission to Shell to support the
CarDevicePolicyManagerTest. This permission is needed to call
DevicePolicyManager#lockNow  which locks the device.

Bug: 187199256
Test: atest CarDevicePolicyManagerTest
Merged-In: I3fa20b53b929c97a6760d65b432a74c3415d6a08
Change-Id: I3fa20b53b929c97a6760d65b432a74c3415d6a08
2021-12-02 23:49:22 +00:00
Issei Suzuki
b4123126bb Merge "Clean up windows which stuck in animatingExit state." into sc-v2-dev am: 85aacccba1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16296642

Change-Id: I323599b607cabba336ebf9d5aaa20a54299873e9
2021-11-24 15:13:06 +00:00
Issei Suzuki
bdc4e842cf Clean up windows which stuck in animatingExit state.
WM delays to destroy window surface if the window is running an exit
animation, and clean it up after the animation finishes. In case the
clean up process was not triggered, we do it before starting an app
transition.

Note that this is a safe guard for potential bugs. The surface shall
be destroyed as soon as an animation finishes, so the clean up should
have been done before an app transition starts.

Bug: 205335975
Test: atest AppTransitionControllerTest
Change-Id: I9c37ab9ebc57ef48827df25ecc52bf09101ad419
2021-11-24 12:54:13 +01:00
Hongwei Wang
d6a5dd6b56 Merge "Allow auto-pip on launching new Task from TaskBar" into sc-v2-dev am: aa2c404692
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16215474

Change-Id: Ifc5f764ed93af2928002b74a44865d7a1f155785
2021-11-19 00:28:19 +00:00
Hongwei Wang
0a53b766cb Allow auto-pip on launching new Task from TaskBar
Loosen the check on FLAG_RESUME_WHILE_PAUSING in
TaskFragment#startPausing for auto-enter-pip.

Fixed also the round corner radius calculation in WMShell component for
entering PiP transition.

Bug: 198227082
Bug: 202574512
Video: http://recall/-/aaaaaabFQoRHlzixHdtY/bEPWcJSn8iGbLLNg6cM0E3
Test: no auto-enter on quick switch and does on launching new Task,
      see video for details
Test: atest PinnedStackTests#testAutoPipOnLaunchingAnotherActivity
Change-Id: I53e62a5f6e663b2d6df8cd0aaa858ff01ef073e8
2021-11-18 10:50:29 -08:00
Xin Li
10d9972786 Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918
Bug: 205056467
Merged-In: I13199bc39e9445929195f3d15579cbffe94e92b0
Change-Id: I35fa3c6c2abf679c51033f1395a08d511ed8739f
2021-11-18 17:00:37 +00:00
Marcus Hagerott
e143499017 Merge "Allow ContactsProvider to use compat change framework" am: 911df4f515 am: 36f5ca1920 am: fa2c7f2eb1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1894075

Change-Id: I5d52b1cc825246e1a3a39d8a277aa02aa5c4b00c
2021-11-17 20:18:16 +00:00
Marcus Hagerott
fa2c7f2eb1 Merge "Allow ContactsProvider to use compat change framework" am: 911df4f515 am: 36f5ca1920
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1894075

Change-Id: I55d1e0532cce2646a2a6839a4e43d4552311c592
2021-11-17 19:55:24 +00:00
Marcus Hagerott
6c681056bb Allow ContactsProvider to use compat change framework
BUG=188347648
Test: m droid

Change-Id: Ifb6675777c76ca1c44af96ceb02a6207d28bd045
2021-11-16 13:40:41 -08:00
Vishnu Nair
7f84221a10 Merge "WM: Handle primary display orientation when calculating the transform hint" am: 5fb9f63795 am: b83ee72e64
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1887653

Change-Id: I4a99911c7dbe8f69e35dd107e0d15b09f657bec0
2021-11-11 19:13:36 +00:00
Vishnu Nair
cbb12e2e76 WM: Handle primary display orientation when calculating the transform hint
Query the surface flinger property
ro.surface_flinger.primary_display_orientation to determine the
primary display's install orientation. If the window is on the
primary display, then update the transform hint passed on to the
client.

Bug: 196167822
Test: check initial buffer transforms on displays with a different
install orientation

Change-Id: Idf010cd6be73172ba708820f87046c3ba3cf8001
Merged-In: Idf010cd6be73172ba708820f87046c3ba3cf8001
2021-11-11 03:14:21 +00:00
Oscar Azucena
e99c148452 RESTRICT AUTOMERGE: Fixed permission issue in car shell am: 758a68da66
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16204269

Change-Id: Ic2105a146429caca9d820dda222b25d9c68dd1f0
2021-11-08 19:36:48 +00:00
Oscar Azucena
758a68da66 RESTRICT AUTOMERGE: Fixed permission issue in car shell
- Added missing private app permission to car shell.

Bug: 205404459
Test: m -j, flash device, boot completes
Change-Id: I23f3a890b4b28b758f6cce4ad63ef84bcda64427
2021-11-07 03:45:33 +00:00
Gaurav Bhola
65fd1b2dd1 RESTRICT AUTOMERGE Fix the bootloop happening due to missing permission. am: 9a2c897fea
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16144749

Change-Id: Ibcea04ac7ee7451a7be2b0f7ead73ccab6b581ed
2021-10-30 04:13:42 +00:00
TreeHugger Robot
91da8a2976 Merge "RESTRICT AUTOMERGE Fix the bootloop happening due to missing permission." into sc-v2-dev 2021-10-30 04:03:01 +00:00
Gaurav Bhola
9a2c897fea RESTRICT AUTOMERGE Fix the bootloop happening due to missing permission.
- This was missed during cherry-pick from master.

Bug: 187720593
Test: Manually verified by building and observing no bootloop.
Change-Id: Ib36186380ce6d786b0f0272b8866b5eab51920c2
2021-10-30 00:20:56 +00:00
Issei Suzuki
c34b3262a6 Merge "Add display sleep token information to winscope dump." into sc-v2-dev am: 0f6684e325
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16117039

Change-Id: I2948ef95448289c49c5471abd5732024e5278e7c
2021-10-27 15:11:46 +00:00
Issei Suzuki
3e469aec5a Add display sleep token information to winscope dump.
Change-Id: Ia25854feed3bb6b037d4510a6b5000d906d27313
Merged-In: Ia25854feed3bb6b037d4510a6b5000d906d27313
Bug: 198593156
Test: manual. capture winscope dump and see it.
2021-10-26 12:13:37 +02:00
Evan Rosky
7886804713 Merge "Fix PiP Shell Transitions" into sc-v2-dev am: b93d37627d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16043024

Change-Id: Ic6ff2fe0a800de3f4e481a91bc7f2ddcf2b30a0a
2021-10-20 16:23:09 +00:00
Evan Rosky
c6d5abe414 Fix PiP Shell Transitions
PiP Shell Transitions needs to be more robust to pass CTS tests
reliably.

Some changes:

1. DELIVERED_TO_TOP intents don't create a transition since there is
   no change to the WM hierarchy. This way the app-launch transition
   won't conflict with activityRestartAttempt.

2. If PiP started an expand transition while an enter transition is
   ongoing, cancel the enter transition.
   a. Additionally, because PiP doesn't resize task until the enter
      transition finishes, the expand transition will actually be
      a no-op. If we see this pattern, also cancel the enter
      transition.

3. When taskVanished, make sure to call any pending finishCallback
   because it doesn't allow the running animator to properly finish.
   Transition systems require the finish callback to function
   properly.

4. Minimize the uses of finishTransition with a sync callback. We
   probably need to phase this out because it can conflict with
   subsequent startTransition calls (because only 1 sync is supported
   at a time).

Bug: 183993924
Test: atest PinnedStackTests
Change-Id: Ieb573032839a2f31b0bb371410484fc93a1714fa
2021-10-19 15:50:41 -07:00
Issei Suzuki
54bfd5e650 Merge "Migrate WALLPAPER_LIGHT debug message to ProtoLog." into sc-v2-dev am: cd9c90750a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16004864

Change-Id: I4deaec1f298e177b90ce449ef10fd82b2c825a58
2021-10-12 15:25:14 +00:00
Issei Suzuki
cd9c90750a Merge "Migrate WALLPAPER_LIGHT debug message to ProtoLog." into sc-v2-dev 2021-10-12 15:09:42 +00:00
Chris Li
3d29027eb3 Merge "Don't override with TasmFragmentRemoteAnimation for wallpaper/non-app" into sc-v2-dev am: ffe3162917
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16014032

Change-Id: I1209013acf69b8881e30d4bf0b852a590bc20682
2021-10-12 13:24:46 +00:00
Issei Suzuki
bde317e6b1 Migrate WALLPAPER_LIGHT debug message to ProtoLog.
Test: manual
Bug: 191438572
Bug: 202392340
Change-Id: Ibf538fce834715dc32741f4b52808f99020f741e
2021-10-12 09:38:58 +02:00
Chris Li
53e7502809 Don't override with TasmFragmentRemoteAnimation for wallpaper/non-app
We don't want to allow the client to animate for wallpaper or any
non-app windows.

Bug: 201482129
Bug: 196173550
Test: atest WmTests:AppTransitionControllerTest
      #testOverrideTaskFragmentAdapter_noOverrideWithWallpaper
Change-Id: Ic29db59fc9f9695df9c8ba3a6d812ad217cdd641
2021-10-12 10:03:29 +08:00
Yuncheol Heo
74e94100b0 RESTRICT AUTOMERGE: Give the priv permission CONTROL_CAR_APP_LAUNCH to KitchenSync and CarLauncher. am: e5581e9925
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15990263

Change-Id: I11de17f311023d856772b40053ead3402eb64a37
2021-10-07 19:10:29 +00:00
Yuncheol Heo
e5581e9925 RESTRICT AUTOMERGE: Give the priv permission CONTROL_CAR_APP_LAUNCH to KitchenSync and CarLauncher.
- The permission is need to assign an Activity to TDA in CarLauncher.
- The permission is used in CarActivityManagerTest.

Bug: 200044674
Test: atest CarActivityManagerTest.
Change-Id: I1d5d520ec44f86c1220e89a0a756757d96676da6
2021-10-06 21:15:45 -07:00
Chris Li
53c6e51e34 Merge "Allow organizer to handle transition for non-embedded activity" into sc-v2-dev am: fe71e802f5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15897563

Change-Id: Ief6e9a51f7d5d9671e6f1c0ca25a369aa674ed5b
2021-09-30 23:19:56 +00:00
Chris Li
54d2b20371 Allow organizer to handle transition for non-embedded activity
We want to allow organizer to handle the transition in case like
launching split TaskFragments from a non-embedded activity.

Bug: 200496784
Test: atest WmTests:AppTransitionControllerTest
Test: test with demo app to launch split from non-embedded
Change-Id: Iaf1d07c8cf43fa773fede3c031855085147be263
2021-09-30 20:12:50 +08:00
Chris Li
79ff79b846 Merge "Don't start app transition when there is empty TaskFragment" into sc-v2-dev am: abdb320b70
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15878941

Change-Id: I784a8bf0034e285e228d0916bf7760229d045b87
2021-09-24 03:55:03 +00:00
Chris Li
abdb320b70 Merge "Don't start app transition when there is empty TaskFragment" into sc-v2-dev 2021-09-24 03:34:03 +00:00
TreeHugger Robot
ca7c9ee56f Merge "add CONTROL_APP_BLOCKING permission to car ks app." into sc-qpr1-dev am: 1a8db82016
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15900200

Change-Id: I69db46c8d3814e22c4834b0cca5dca9fdd45f90e
2021-09-24 02:46:14 +00:00