Commit Graph

2827 Commits

Author SHA1 Message Date
Chris Li
b010717bc1 Merge "Disable all input on ActivityRecord during trusted animation" into tm-dev am: 94d10aec87
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17348644

Change-Id: I2793cf043d58ad545c0732b9ec323ea0c453ad56
2022-03-24 07:54:56 +00:00
Chris Li
94d10aec87 Merge "Disable all input on ActivityRecord during trusted animation" into tm-dev 2022-03-24 07:35:28 +00:00
Evan Rosky
ebd0a6ffde Merge "Move the pendingTransaction stuff into BLASTSyncEngine" into tm-dev am: 7ca26cc4d7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17246138

Change-Id: I7ecb8423a0d013ea4dbc3f728d0816edc1fc6ccb
2022-03-24 01:22:28 +00:00
Evan Rosky
7ca26cc4d7 Merge "Move the pendingTransaction stuff into BLASTSyncEngine" into tm-dev 2022-03-23 23:13:01 +00:00
Chris Li
2f49be6dde [conflict] Merge "Disable all input on ActivityRecord during untrusted animation" into tm-dev am: a3e1134c46
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17258046

Change-Id: Iae740ca49a726ab5a022c44cfe748288aa9507b2
2022-03-23 13:56:01 +00:00
Chris Li
a3e1134c46 Merge "Disable all input on ActivityRecord during untrusted animation" into tm-dev 2022-03-23 13:47:59 +00:00
Chris Li
b4c0c4e81b Disable all input on ActivityRecord during trusted animation
As a followup to ag/17258046, since we don't have any use case to
rely on handling input during animation, disable input even if it
is trusted embedding so that it could cover some edge-cases when
a previously truste host starts doing something bad.

Bug: 197364677
Test: atest WmTests:AppTransitionControllerTest
Change-Id: I7312b6ed961891c5c58adad73f660d4a18084c52
2022-03-23 17:49:56 +08:00
Chris Li
a53b05ca8c Disable all input on ActivityRecord during untrusted animation
For cross-process embedding, there can be activity of other app embedded
in untrusted mode. When it happens, we need to disable all input on the
Task if we are going to play client-driven animation to make sure the
host client can't abuse the animation leash.

Bug: 197364677
Test: atest WmTests:AppTransitionControllerTest
Change-Id: I3e299c0a43ac823b7df6af9d02c7168bd65d3271
2022-03-23 10:01:40 +08:00
Evan Rosky
35c049de96 Move the pendingTransaction stuff into BLASTSyncEngine
The functionality has morphed since its original transitions-only
incarnation. Now it is a general queue mechanism for SyncEngine.

So, move it into BLASTSyncEngine and clean-up the abstraction
a little-bit. This should make it more usable for some upcoming
fixes.

Bug: 222033492
Test: existing tests pass (just a refactor)
Change-Id: Ia057e816ad5635e9681d3273d139e494c18216d9
2022-03-22 16:01:49 -07:00
Issei Suzuki
6073f79aa0 Merge "Migrate DEBUG_ANIM logcat message to ProtoLog." into tm-dev am: f51bb0783b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17222683

Change-Id: I4eeffcc5e15da420fe889d4244a0611b75d3c830
2022-03-22 18:40:09 +00:00
Issei Suzuki
f51bb0783b Merge "Migrate DEBUG_ANIM logcat message to ProtoLog." into tm-dev 2022-03-22 18:19:19 +00:00
TreeHugger Robot
ecc0de96a2 Merge "Move DEBUG_INPUT_METHOD logs into proto logs for debugging IME snapshot" into tm-dev am: 697afc9660
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17258043

Change-Id: Id23110157a6b1f39a5052c61a7d970a5214026da
2022-03-22 14:43:01 +00:00
TreeHugger Robot
697afc9660 Merge "Move DEBUG_INPUT_METHOD logs into proto logs for debugging IME snapshot" into tm-dev 2022-03-22 14:40:16 +00:00
Chris Li
31fad40eb2 Merge "Reparent ImeContainer under parent when organized." into tm-dev am: 6cc0fa4d00
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17244762

Change-Id: I3f46e61408e0e8a02659d9d0c43e80e9a98dbf75
2022-03-22 07:38:58 +00:00
Chris Li
6cc0fa4d00 Merge "Reparent ImeContainer under parent when organized." into tm-dev 2022-03-22 07:32:39 +00:00
Issei Suzuki
f3732b4991 Migrate DEBUG_ANIM logcat message to ProtoLog.
Added more log messages around animatingExit.

Bug: 205335975
Test: Existing builds and tests pass.
Change-Id: I4461eddd4a24c7bba1adef1571ce0fbf6d7db0a2
2022-03-21 14:00:13 +01:00
Ionut Hulub
8bda50023d Reparent ImeContainer under parent when organized.
If, for whatever reason, the SystemUI process crashed and restarted,
the IME wasn't functional anymore (it would not become visible).

That happened because, after the SystemUI crash, the IME was
unorganized for a while and the framework reparented its surface
under an activity.

With this commit we fix this issue by reparenting the IME under its
parent when it becomes organized again.

Manual Test: Checked that the IME becomes visible after a systemui
             crash.
Test: atest DisplayContentTests
      #testImeContainerIsReparentedUnderParentWhenOrganized
Bug: 224800157
Change-Id: I303baf96c905a9c4b444189b731f63c7d51a11f2

Change-Id: I4d2934516e528bf353395e1759f59612542bdb56
2022-03-21 16:16:20 +08:00
Ming-Shin Lu
db1e72190f Move DEBUG_INPUT_METHOD logs into proto logs for debugging IME snapshot
Bug: 224664116
Test: build, verify with enabling proto log:
 adb shell wm logging enable WM_DEBUG_IME, see if IME snapshot logs
 printed.

Change-Id: Ia61e6f3955178d9a4deb68ba1d8ae7d4ebb341d1
2022-03-21 15:32:42 +08:00
Jack He
8164e677af Merge "Shell: Grant BLUETOOTH_PRIVILEGED permission to Shell" am: 69e560995c am: eada5871f4 am: 384882aada am: 9d8b6c7b32
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2031463

Change-Id: Icc2703da9278250dffd6d594389f0d4fdc7fdb76
2022-03-19 01:01:56 +00:00
Jack He
9d8b6c7b32 Merge "Shell: Grant BLUETOOTH_PRIVILEGED permission to Shell" am: 69e560995c am: eada5871f4 am: 384882aada
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2031463

Change-Id: Id694d0b7240a3ffb757b9ba0f87469b97aca0dd8
2022-03-19 00:55:12 +00:00
Jack He
384882aada Merge "Shell: Grant BLUETOOTH_PRIVILEGED permission to Shell" am: 69e560995c am: eada5871f4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2031463

Change-Id: I82645039ddaa7514992d3967b9a64efc77444896
2022-03-19 00:35:45 +00:00
Beth Thibodeau
e6a428b452 Merge "Revert^2 "Use compat framework to gate session actions"" into tm-dev am: 77472b3e78
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17222204

Change-Id: I1c5b156ee15194b22fd638479419570aaf0674d4
2022-03-19 00:02:43 +00:00
Beth Thibodeau
77472b3e78 Merge "Revert^2 "Use compat framework to gate session actions"" into tm-dev 2022-03-18 19:56:38 +00:00
Jack He
fedd79c9d7 Shell: Grant BLUETOOTH_PRIVILEGED permission to Shell
* So that we can run CTS test with Shell permission

Bug: 225250442
Test: make
Change-Id: I9bf52d9325732c8ea1fef102591da1198b8c4fae
2022-03-18 00:33:22 -07:00
Sharon Su
d2c55114fb Merge "Change android.permission.MANAGE_WALLPAPER_EFFECTS_GENERATION to signature| privileged Test: cts test Bug: 213238425 Change-Id: Iacaec0904a1d1c14ba8b0ec8f3871376ff33f01c" 2022-03-17 20:07:43 +00:00
Naomi Musgrave
4b563a2d37 Merge "Capture the contents of a single task" into tm-dev 2022-03-17 17:03:48 +00:00
Sharon Su
917750b03a Change android.permission.MANAGE_WALLPAPER_EFFECTS_GENERATION to signature| privileged
Test: cts test
Bug: 213238425
Change-Id: Iacaec0904a1d1c14ba8b0ec8f3871376ff33f01c
2022-03-16 23:12:40 +00:00
Beth Thibodeau
a14e2883b5 Revert^2 "Use compat framework to gate session actions"
This adds ag/17208491 (check compat change with UserHandle) to the
original change

da972b8c71

Bug: 220034304
Test: manual
Test: make tradefed-all javac-check -j64 RUN_ERROR_PRONE=true
Test: atest PlatformScenarioTests:android.platform.test.scenario.sysui.media.QSMediaPlayerContent

Change-Id: Ibaec0c9a0443fd3b0f2c5fae7c74b2110371b425
2022-03-16 13:56:51 -04:00
Andrei-Valentin Onea
61189993a0 Merge "Revert^2 "Move out allowlists for com.android.cellbroadcast"" into tm-dev 2022-03-16 14:05:43 +00:00
Miguel Aranda
f9b72c1f9e Merge "Revert "Use compat framework to gate session actions"" into tm-dev 2022-03-16 11:45:14 +00:00
Miguel Aranda
da972b8c71 Revert "Use compat framework to gate session actions"
Revert "Update media flag descriptions"

Revert submission 17161599-b220034304-media-compat

Reason for revert: This seems to cause the break in b/224895002
BUG: 224895002
Reverted Changes:
Ifeecb4e13:Update media flag descriptions
Ie032fe9ec:Use compat framework to gate session actions

Change-Id: I8b309a69282f41b4a45bd82bd3dcc9f85751da7e
2022-03-16 11:34:51 +00:00
TreeHugger Robot
96a7b9ee75 Merge "Use compat framework to gate session actions" into tm-dev 2022-03-15 17:03:06 +00:00
Naomi Musgrave
13194c3ca4 Capture the contents of a single task
Introduces layer mirorring of a single task, given the task is both
identified (future work - dependency on setup flow in SysUI) and the
flag is enabled (currently disabled).

Error handling (tearing down the VirtualDisplay if task recording setup failed)
will come in a future change

Bug: 216625226
Test: atest WmTests:DisplayContentTests
Test: atest WmTests:ContentRecorderTests
Change-Id: I16abd55ce75537ff8fbbb379e4970668ea02a230
2022-03-15 14:13:11 +00:00
Shan Huang
7c722ca403 Merge "Implement back to launcher animation from shell and WM animation controllers." into tm-dev 2022-03-15 05:38:25 +00:00
Etan Cohen
19b2879e24 Merge "Add MANAGE_WIFI_INTERFACES to the shell permission" am: dc2f8bfaee am: 8dcf52fdd9 am: ab6b6abfcd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2021397

Change-Id: I9356201e6a6817e3ab69c196e2f86ab622cc4c53
2022-03-15 00:21:17 +00:00
Etan Cohen
ab6b6abfcd Merge "Add MANAGE_WIFI_INTERFACES to the shell permission" am: dc2f8bfaee am: 8dcf52fdd9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2021397

Change-Id: I30705a0db0969c8bafbaa827761a25aca815d455
2022-03-15 00:05:02 +00:00
Beth Thibodeau
85dddfc3c6 Use compat framework to gate session actions
Adds CompatChange to check if an app posting media controls targets T,
and if so, that app's controls will use PlaybackState actions.
Otherwise, the notification actions will be used.

The MEDIA_SESSION_ACTIONS flag is set to false by default, and can be
used to override this and use session actions for all apps.

Fixes: 220034304
Test: atest com.android.systemui.media
Test: manual - verify in developer settings, override behavior works

Change-Id: Ie032fe9ec8ce7d46b1f9dc8f590ed6fbfa7ee9aa
2022-03-14 19:46:19 -04:00
Shan Huang
0e9d709e2f Implement back to launcher animation from shell and WM animation
controllers.

Test: m -j.
Test: Open and swipe back on pre-T and T apps.
Test: atest BackNavigationControllerTests
Test: atest BackAnimationControllerTest
Bug: 195946584

Change-Id: I981f8deff9fad75355ee0e8bbe08b375f4da6e74
2022-03-14 23:12:41 +00:00
Etan Cohen
dc2f8bfaee Merge "Add MANAGE_WIFI_INTERFACES to the shell permission" 2022-03-14 23:03:25 +00:00
TreeHugger Robot
8ee22a3455 Merge changes from topic "da-rearc" into sc-v2-dev-plus-aosp
* changes:
  [automerge] DO NOT MERGE add android.car.permission.CONTROL_CAR_APP_LAUNCH permission 2p: f7b9a4dd28
  DO NOT MERGE add android.car.permission.CONTROL_CAR_APP_LAUNCH permission
2022-03-11 05:08:36 +00:00
Oscar Shu
6793c6fd69 Merge "Rename MANAGE_WIFI_AUTO_JOIN to MANAGE_WIFI_NETWORK_SELECTION" am: 2349f6f641 am: 64c4227b11 am: c917ab08d9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2019225

Change-Id: If94a79731f5a7605717e10cf978f9c42b78cea11
2022-03-11 01:32:42 +00:00
Oscar Shu
c917ab08d9 Merge "Rename MANAGE_WIFI_AUTO_JOIN to MANAGE_WIFI_NETWORK_SELECTION" am: 2349f6f641 am: 64c4227b11
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2019225

Change-Id: I532f058cee7aaa0142fdcbb1bc1108e5e05daa88
2022-03-11 01:12:09 +00:00
Presubmit Automerger Backend
7d8ba19027 [automerge] DO NOT MERGE add android.car.permission.CONTROL_CAR_APP_LAUNCH permission 2p: f7b9a4dd28
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17086297

Bug: 194334719
Change-Id: Id62bf0c0a1dc6286ce90002fe18ccb57e26a4f93
2022-03-11 00:03:45 +00:00
priyank
f7b9a4dd28 DO NOT MERGE add android.car.permission.CONTROL_CAR_APP_LAUNCH permission
This file has been moved to a different location in "tm-dev" Hence, DO NOT MERGE
Bug: 194334719
Test: Manual
Change-Id: I6b25e4ea1d14051902b53d6542b346d55646b16c
2022-03-11 00:03:35 +00:00
TreeHugger Robot
73cf218fe8 Merge "Allow sysui and launcher to use FLAG_SLIPPERY" into tm-dev 2022-03-10 23:34:49 +00:00
Etan Cohen
bee32e37f6 Add MANAGE_WIFI_INTERFACES to the shell permission
Enable CTS validatio of the protected APIs.

Bug: 223512835
Test: builds
Change-Id: Ie34564e2bc09937636629b395cc303b1f2c0a537
2022-03-10 22:23:32 +00:00
Jay Thomas Sullivan
90f8bc6f9d Rename READ_MEDIA_IMAGE to READ_MEDIA_IMAGES
This permission was only created very recently, and it is unlikely that
any apps are using it yet.

After its creation, it was decided that it should be renamed.

Bug: 223691971
Test: atest CtsPermissionTestCases CtsPermission3TestCases
Change-Id: I9c171161e2c60d38c14e167ea7b7b87bf1235e1b
2022-03-09 23:38:06 -08:00
xshu
b869dbaee6 Rename MANAGE_WIFI_AUTO_JOIN to MANAGE_WIFI_NETWORK_SELECTION
Change to request for the updated permission.

Bug: 219947411
Test: compile
Change-Id: Iaf31a24080961a5e224bbd3871649fe7694dc3a5
2022-03-09 16:04:55 -08:00
Sam Dubey
00f9beb29d Allow sysui and launcher to use FLAG_SLIPPERY
Following commit I7a81d97ffccd7d56ca4f7e655e2cbf715b200ab0, the flag will be used to enable the interaction of pulling down the notification shade from the home screen.

Fix: 222991453
Change-Id: Ib49fcb6bd918b90f770b116f37ed356c2b2d59a6
(cherry picked from commit c07d90ff20)
2022-03-09 01:12:00 +00:00
Andrei-Valentin Onea
ee984194ab Merge "Move out mediaprovider allowlist entries" into tm-dev 2022-03-07 14:34:10 +00:00