Commit Graph

2945 Commits

Author SHA1 Message Date
Siarhei Vishniakou
df6630ae1f Require CONFIG_HID_PLAYSTATION for DualSense key layout
Some olders kernels don't yet support HID_PLAYSTATION. While they are
working on supporting this driver, provide this temporary solution.

Before this patch, if the key layout is loaded, but there is no
HID_PLAYSTATION, then the mappings on the device will be incorrect.

With this patch, this key layout will not be loaded unless there is a
CONFIG_HID_PLAYSTATION enabled on the device.

Instead, when the main layout cannot be loaded, we make another attempt
to load a fallback layout. This way, the mappings on DualSense can be
correct even if the HID_PLAYSTATION module is not loaded.

In this CL, the fallback layout was tested using controllerTester.

Bug: 228005926
Test: tested mappings with a DualSense controller on a device that does
not have CONFIG_HID_PLAYSTATION

Change-Id: I7e46ae1943cd2c63b8c0b03fdf5d71adeea89f6f
2022-06-03 14:12:29 -07:00
Issei Suzuki
63969526ea Merge "Exclude launcher from app transition animation while recents is running." into tm-dev am: 0dfb582d5a am: b301430f6c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18492309

Change-Id: I0239b487d325c72888f04cd563798779a64b9f7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-31 16:28:27 +00:00
Issei Suzuki
0dfb582d5a Merge "Exclude launcher from app transition animation while recents is running." into tm-dev 2022-05-31 15:48:01 +00:00
Rubin Xu
07df5c4d16 Update security_log_writer group name
group name was changed during review but not updated
in the permission mapping.

Bug: 232283779
Test: manual
Change-Id: Ib7df61fa4fd49c8419f0543fd6c54186a33ebeb6
(cherry picked from commit 4486314be6)
Merged-In: Ib7df61fa4fd49c8419f0543fd6c54186a33ebeb6
2022-05-26 17:45:49 +00:00
Treehugger Robot
2cdcb066bf Merge "Update security_log_writer group name" am: 5a66f41fa4 am: 5327a51e5a am: 63283e7450 am: b3fbe80e36 am: e20354c3c3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2108084

Change-Id: I94fc2dbd276d327216bc3521d57744a9f0966e63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-26 17:39:10 +00:00
Treehugger Robot
e20354c3c3 Merge "Update security_log_writer group name" am: 5a66f41fa4 am: 5327a51e5a am: 63283e7450 am: b3fbe80e36
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2108084

Change-Id: I3f189e0839934cc27cc26768064cf7436272e4dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-26 17:12:07 +00:00
Treehugger Robot
63283e7450 Merge "Update security_log_writer group name" am: 5a66f41fa4 am: 5327a51e5a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2108084

Change-Id: I06beb1a61be0620176466061cf86b3a7b37e8a51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-26 16:07:57 +00:00
Treehugger Robot
5327a51e5a Merge "Update security_log_writer group name" am: 5a66f41fa4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2108084

Change-Id: I42fc0a1fb5536332a072430262b68636b3ad77b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-26 15:40:22 +00:00
Rubin Xu
4486314be6 Update security_log_writer group name
group name was changed during review but not updated
in the permission mapping.

Bug: 232283779
Test: manual
Change-Id: Ib7df61fa4fd49c8419f0543fd6c54186a33ebeb6
2022-05-26 12:44:55 +01:00
Rubin Xu
bcb0741c91 Map WRITE_SECURITY_LOG permission to gid
Map WRITE_SECURITY_LOG to AID_SECURITY_LOG_WRITE which is how logd
controls access to security log buffer.

Bug: 232283779
Test: manual
Change-Id: Ifde2e5192326f0811807dcb05563b1b5b63077ce
(cherry picked from commit e806776e54)
Merged-In: Ifde2e5192326f0811807dcb05563b1b5b63077ce
2022-05-25 20:54:27 +00:00
TreeHugger Robot
1c903d3424 Merge "Merge "Map WRITE_SECURITY_LOG permission to gid" am: 2b2b455884 am: 356f81b957" into tm-dev-plus-aosp am: df2b24a558 am: 2e03027e18 am: 4c5e6501a8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2105065

Change-Id: I95fc729f2ad16803b38cb981d4200b27dd94e47e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 16:05:08 +00:00
TreeHugger Robot
4c5e6501a8 Merge "Merge "Map WRITE_SECURITY_LOG permission to gid" am: 2b2b455884 am: 356f81b957" into tm-dev-plus-aosp am: df2b24a558 am: 2e03027e18
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2105065

Change-Id: Idc073ce006d8004aad960390806c5c57252a6780
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 15:49:55 +00:00
Issei Suzuki
05cd2b6104 Exclude launcher from app transition animation while recents is running.
Changed approach to handle conflict between app transition and recents.

In order to fix flicker which happens when recents and app transition
start in a short time, we delayed app transition while recents was
running. However this approach brought side effects such as b/232984498.

When recents starts, we just want to wait that the launcher activitiy
finishes rendering and commit its visibility without animation. Added a
flag DisplayContent#mExcludeLauncherFromAnimation flag, so that we can
now explicity declare whether we want to apply animation on the launcher
or not.

Bug: 223499269
Bug: 231711212
Bug: 232984498
Test: atest com.android.server.wm.AppTransitionTests
Test: atest AppTransitionTest + manual tests
  Test 1
   1. Launch Gmail app
   2. Click icon on the bottom tab (e.g. Chat)
   3. Swipe up from the bottom (immediately after step 2)
   4. Verify closing animation only plays once
  Test 2
   1. Launch "Google TV"
   2. Play a trailer
   3. Full screen and PIP mode switch twice
   4. Verify PIP window is shown
  Test 3
   1. Change phone to portlait mode
   2. Launch Photo app
   3. Swipe up from the bottom
   4. Verify no rotation animation on the launcher
  Test 4
   1. Install 3P launcher and set it default.
   2. Launch Gmail app
   3. Swipe up to go back home
   4. Launch Chrome app
   5. Swipe up and hold to go to overview.
   6. Scroll to Gmail app and click.
   7. Verify Gmail app is launched without delay.
Change-Id: I0ccb99479684d17453ce57e8797024c0cd233ac3
2022-05-25 13:44:47 +00:00
Rubin Xu
c8c601c335 Merge "Map WRITE_SECURITY_LOG permission to gid" am: 2b2b455884 am: 356f81b957
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2105065

Change-Id: Ic70701d437bc15b73b8ff85004c0329059499d64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 12:20:46 +00:00
Rubin Xu
356f81b957 Merge "Map WRITE_SECURITY_LOG permission to gid" am: 2b2b455884
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2105065

Change-Id: I8453536d82e840da22d7f94a167f4a95b3826ad5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 12:01:56 +00:00
Rubin Xu
2b2b455884 Merge "Map WRITE_SECURITY_LOG permission to gid" 2022-05-25 11:43:50 +00:00
Rubin Xu
e806776e54 Map WRITE_SECURITY_LOG permission to gid
Map WRITE_SECURITY_LOG to AID_SECURITY_LOG_WRITE which is how logd
controls access to security log buffer.

Bug: 232283779
Test: manual
Change-Id: Ifde2e5192326f0811807dcb05563b1b5b63077ce
2022-05-24 23:27:10 +01:00
Winson Chung
4212e7cdbb Merge changes I1978ce3a,I79160004 into tm-dev am: 35640f948e am: d0cd381a0b am: ce8f9488f2 am: 825eee18fc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18385451

Change-Id: I96ae28a43aaeb12f25485fb020d3392a6304e715
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19 02:23:01 +00:00
Winson Chung
ce8f9488f2 Merge changes I1978ce3a,I79160004 into tm-dev am: 35640f948e am: d0cd381a0b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18385451

Change-Id: I80e97f57ea58634ecc647bccded63ef15615c558
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 22:47:35 +00:00
TreeHugger Robot
7b52f23021 Merge "Remove duplicate allowlist entries for Bluetooth" into tm-dev am: 5ea9ade689 am: b5d25971f9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18080601

Change-Id: I91ce49042ff421fb80035a1b34795319fb61168c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 21:51:40 +00:00
TreeHugger Robot
8ed8f60cdc Merge "Remove duplicate allowlist entries for Bluetooth" into tm-dev am: 5ea9ade689 am: 0dd6fa2510 am: 4c53be5731 am: 2c05963a48
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18080601

Change-Id: I1fc93a285d46f6b5882715c86007107e958f65f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 21:25:28 +00:00
TreeHugger Robot
2c05963a48 Merge "Remove duplicate allowlist entries for Bluetooth" into tm-dev am: 5ea9ade689 am: 0dd6fa2510 am: 4c53be5731
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18080601

Change-Id: I5d0428ef738fe9c6a4cc23b09a2de68f1fe3c021
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 21:01:27 +00:00
Winson Chung
35640f948e Merge changes I1978ce3a,I79160004 into tm-dev
* changes:
  Add workaround for new back flow with legacy recents animation
  Ensure recents input consumer can be focused in Overview
2022-05-18 17:23:38 +00:00
Evan Rosky
a8e8cfe8ab Merge "Fix pip bundling" into tm-qpr-dev am: 97b292f627 am: 03c72cfda4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18382174

Change-Id: I51cc8c7fa7194ea8d403eaf8aa3212c12462254b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-17 22:31:07 +00:00
Evan Rosky
97b292f627 Merge "Fix pip bundling" into tm-qpr-dev 2022-05-17 17:06:00 +00:00
TreeHugger Robot
5ea9ade689 Merge "Remove duplicate allowlist entries for Bluetooth" into tm-dev 2022-05-16 20:59:24 +00:00
Evan Rosky
046ec8336e Fix pip bundling
Not all pips should be their own transition. This CL
changes the rules so that any pip originally requested
by the system (even if done via the app -- eg legacy
pause+userLeaving) will not get their own transition
and instead be bundled into the current one.

This also fixes an issue where transient launch
committal was only entering pip for the new auto-enter
case but not the legacy userLeaving case.

Bug: 220196913
Bug: 231150615
Test: launch a legacy userLeave-enters-pip app and
      then go home (swipe or button).
Change-Id: I3c20341971ab4512509daa70314742f84c1ccd6b
2022-05-16 11:56:15 -07:00
Winson Chung
03df66775f Add workaround for new back flow with legacy recents animation
- Override the callback to inject back as we do today while in Overview.
  We can't rely on the client side compat callback because the Launcher
  window is not focused in this current state.

Bug: 223750399
Test: Open overview, swipe back
Change-Id: I1978ce3a91cba3e57c0f8bab366691b48a9d5921
2022-05-14 00:09:13 +00:00
Evan Rosky
a2be652755 Merge "Ensure move-to-back has its own transition." into tm-qpr-dev am: 7c001fabf2 am: d8ef6c921d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18283295

Change-Id: I8f82d5b80c9377a5af869405f87f587b62fc1495
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 21:50:34 +00:00
Evan Rosky
7c001fabf2 Merge "Ensure move-to-back has its own transition." into tm-qpr-dev 2022-05-13 18:17:43 +00:00
Nick Chameyev
c755c4364c Merge "Synchronize display change with the Shell" into tm-qpr-dev am: 343260adfa am: f32f8b0d0b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18140347

Change-Id: I7f0e7e6e2861ea08513a98f66dc6cfc5c52bcab0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 18:02:24 +00:00
Evan Rosky
d260e1cbcd Ensure move-to-back has its own transition.
In general, we need to move to a model where each transition is
a "fixed" transaction (rather than absorbing everything within
a specific time-window).

Bug: 232020248
Test: PinnedStackTests#testMovePipToBack*
Change-Id: Icf5d36e507bc70736e7760c50d5de297bfe4d8f4
2022-05-12 10:51:00 -07:00
Nick Chameyev
343260adfa Merge "Synchronize display change with the Shell" into tm-qpr-dev 2022-05-12 16:55:06 +00:00
Galia Peycheva
735dc5d336 Merge "Set TvBottomSheetActivity as unrestricted keep-clear area" into tm-dev am: 7a662cfbf9 am: bc33153bb5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18177605

Change-Id: I15294f4498203f660fb506ccabbb84cf09f933e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 20:48:56 +00:00
Galia Peycheva
27b8d06769 Merge "Set TvBottomSheetActivity as unrestricted keep-clear area" into tm-dev am: 7a662cfbf9 am: 8d7761469c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18177605

Change-Id: Idbb9392dedc18d111a2b0fda9b6e18fc0acdb1fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 20:42:31 +00:00
Galia Peycheva
7a662cfbf9 Merge "Set TvBottomSheetActivity as unrestricted keep-clear area" into tm-dev 2022-05-11 07:43:24 +00:00
Issei Suzuki
006fa97387 Merge "Suppress app transition while recents is running" into tm-dev am: fca1e25c59 am: b1050a102f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18232543

Change-Id: Ida53de8a528cd005ff997280c47ef1afac74fdce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:41:32 +00:00
Issei Suzuki
1e3fd4137d Merge "Suppress app transition while recents is running" into tm-dev am: fca1e25c59 am: d801dcfc6e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18232543

Change-Id: Ib200361c9993036cc1f080e310a71e5558880192
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:25:00 +00:00
Nick Chameyev
0e1d4e23cb Synchronize display change with the Shell
This CL adds synchronization of applying of the window
container transaction with split-screen layout changes after
the display size change. This is needed for the unfold
animation to have the split screen layout ready
for the first frame of the unfold animation on foldable
devices.

The flow is similar to the display rotation synchonization,
now it is triggered on both physical display change and
rotation.

Bug: 204925795
Test: folding/unfolding, rotating with a split layout
  when Shell transitions enabled/disabled
Change-Id: I30f391dae69cf38768daf49361660d87165f886d
2022-05-10 09:50:34 +00:00
Issei Suzuki
a5c1feda65 Merge "Revert "Suppress app transition while recents is running"" into tm-dev am: d2303d97a4 am: b32c07e85f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18204686

Change-Id: I56ac1aca673d66a75d75f2dd36ce9e478629c133
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 17:35:59 +00:00
Issei Suzuki
ada19dd903 Merge "Revert "Suppress app transition while recents is running"" into tm-dev am: d2303d97a4 am: 005860c14c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18204686

Change-Id: I9f6c2f5259b242a158d87f2f5047a12b234e8870
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 15:21:06 +00:00
Issei Suzuki
d49b5d442d Suppress app transition while recents is running
This fixes conflict between app transition and recents animation in the
following scenario.

1) App transition animation finishes after app closing animation, which
is controlled by recents, finishes.

During the app closing animation, recents makes the closing app surface
invisible, but app transition animation overrides it to visible again.
This causes a flicker.

2) App transition starts during recents animation.

This can happen when a user launches an activity, and immediately after
that, swipes up the screen to close the app.

While recents is running, we assume animation on tasks is controlled by
recents, and visibility is commited without animation after recents
animation finishes. However starting app transition during recents
breaks this assumption, which ends up with playing one more unexpected
closing animation (so users see closing animation twice).

Bug: 223499269
Bug: 231669960
Test: atest AppTransitionTest + manual tests
  Test 1
   1. Launch Gmail app
   2. Click icon on the bottom tab (e.g. Chat)
   3. Swipe up from the bottom (immediately after step 2)
   4. Verify closing animation only plays once
  Test 2
   1. Launch "Google TV"
   2. Play a trailer
   3. Full screen and PIP mode switch twice
   4. Verify PIP window is shown
  Test 3
   1. Change phone to portlait mode
   2. Launch Photo app
   3. Swipe up from the bottom
   4. Verify no rotation animation on the launcher
Change-Id: Ic18d00812308903db08d3564136f33f1eccf408c
2022-05-09 14:10:14 +00:00
Issei Suzuki
d2303d97a4 Merge "Revert "Suppress app transition while recents is running"" into tm-dev 2022-05-09 10:00:41 +00:00
TreeHugger Robot
6324501536 Merge "Fix PiP transition ordering" into tm-qpr-dev am: a8b3591b6b am: 73c411eca7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18176064

Change-Id: Id36e38bf3c5317b51b1e854896f38334954786b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-07 02:10:27 +00:00
Neha Jain
a2e0455cd9 Revert "Suppress app transition while recents is running"
This reverts commit c34693dcac.

Reason for revert: Causing PiP to fail b/231669960
Bug: 231669960
Change-Id: Ib16cf999071fd06bd9a574859f8fb18d6fede3fa
2022-05-06 20:40:28 +00:00
Evan Rosky
4f7be5bd52 Fix PiP transition ordering
First, this cancels the existing pip animation if it is
told to exit. Without this, an exit animation that
starts before an enter animation finishes will have its
state clobbered by the exit's finishTransition call.

Next, make pip-enter transitions queue-up so that they
don't interleave before other queued transitions (very
common during CTS).

Bug: 231150615
Test: atest PinnedStackTests
Change-Id: I7f162c0b1f24ab845770b805c8fae2252814945e
2022-05-06 13:03:03 -07:00
Chavi Weingarten
c9818a57ba Merge "Set focus to WMS computed focus when embedded window drops focus" into tm-dev am: 823b164edd am: 5aa8c0d2a9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18143057

Change-Id: Icf5c842fd5c783803c346284c6f78d349af756f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 18:38:51 +00:00
Chavi Weingarten
823b164edd Merge "Set focus to WMS computed focus when embedded window drops focus" into tm-dev 2022-05-06 18:07:46 +00:00
TreeHugger Robot
30998190bb Merge "Complete Reference RCU keylayout with all buttions" into tm-dev am: db2310a284 am: 340bd0eeaf
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17803125

Change-Id: Ie92b753a02d152d3d1ff40493d4fceb5e9507a54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 15:56:16 +00:00
Issei Suzuki
ab569bcef3 Merge "Suppress app transition while recents is running" into tm-dev am: 0d83eb099d am: 48fd600e17
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18140343

Change-Id: If7fc42f59a1ea05b017fd2033b4b105a6c1295b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 15:39:38 +00:00