Commit Graph

1457 Commits

Author SHA1 Message Date
Chris Li
65986c1e5d Merge "Do not preload recents activity if it will be visible" into sc-v2-dev am: 5b7911b8a3 am: 56640cd192
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15319290

Change-Id: I81eff002588e95761c272e98715cce07895c4efe
2021-07-21 19:26:53 +00:00
Chris Li
56640cd192 Merge "Do not preload recents activity if it will be visible" into sc-v2-dev am: 5b7911b8a3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15319290

Change-Id: I322c1ce27cd3cce21114f33267250ebe803ca0cc
2021-07-21 19:17:56 +00:00
Chris Li
8c67051b97 Do not preload recents activity if it will be visible
Before, even if the launcher was not launched, RecentsAnimation would
start the activity in background as invisible. It would cause issue
because ensureVisibility would make it visible because there is no
opaque activity on top, while that may not be collected in any app
transition.

Now, in case the recents activity should be visible, we ignore the
 preload recents activity.

Bug: 193565751
Test: pass failed launcher test
Change-Id: I93f5a716177bcbf69f5e4d5915826bd9f61f53a4
2021-07-20 23:48:51 -07:00
Rambo Wang
849474a343 Merge "Support platform-compat-framework for TeleService" am: 7ad8aa929e am: 2e7d4fe98b am: 02adf2d91d am: 4487b40f3a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1747977

Change-Id: Icbf0e82b4f46bc1fe5bab8ffaf0ede75f06f968e
2021-07-16 22:47:01 +00:00
Rambo Wang
4487b40f3a Merge "Support platform-compat-framework for TeleService" am: 7ad8aa929e am: 2e7d4fe98b am: 02adf2d91d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1747977

Change-Id: Ia630dfdba5e445597aaaa9c6bb58aa5a71acb873
2021-07-16 22:31:57 +00:00
Rambo Wang
02adf2d91d Merge "Support platform-compat-framework for TeleService" am: 7ad8aa929e am: 2e7d4fe98b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1747977

Change-Id: Iedefd178c03f988435e6fbf21a8744aefa3ae174
2021-07-16 22:16:53 +00:00
Evan Rosky
4eecbeac2a Merge "Add multi-display support to shell transitions" into sc-v2-dev am: 2f7eef8248 am: 2bf493a69c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14950060

Change-Id: If5ac850ea15035f7970699d31926b32c6744f3ee
2021-07-14 17:49:12 +00:00
Grace Cheng
d298ee68fd Merge "Grants WRITE_SECURE_SETTINGS permission to AdasLocationTestApp" into sc-v2-dev am: 34f39c86ba am: aa2ede6721
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15239171

Change-Id: If0deb462053726f0e63898fd63c4978ad084f182
2021-07-12 20:42:24 +00:00
Louis Chang
29865758df Merge "Allow changing focus between embedded activities in a Task" into sc-v2-dev am: cac8caf2bd am: b13e5c5fe2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15127230

Change-Id: I171dd8efe33fcd3854459c54eb81ca974eff8d5e
2021-07-12 20:32:03 +00:00
Evan Rosky
466cda4ec3 Add multi-display support to shell transitions
This tracks ready state in groups. Currently the groups are
display-contents (to match legacy transitions). The transition
will be considered ready when all groups are ready.

This also adds a couple of inTransition checks in places that
are used by CTS tests.

Bug: 183993924
Test: atest MultiDisplaySystemDecorationTests
Change-Id: Iea81b3c689d948d60aa8e1a2d3bf168723058a2f
2021-07-11 17:49:36 -07:00
Grace Cheng
34f39c86ba Merge "Grants WRITE_SECURE_SETTINGS permission to AdasLocationTestApp" into sc-v2-dev 2021-07-09 23:53:49 +00:00
Nikita Ioffe
a4a45524c5 Merge "Grant INSTALL_PACKAGE_UPDATES permission to Shell" into sc-dev am: 1d2cbb6f50 am: ad368f8cb8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15235316

Change-Id: Ifbbbc15a927b536a3d64ec8a7c71a72772f99dd4
2021-07-09 11:54:56 +00:00
Nikita Ioffe
454d31beff Merge "Grant INSTALL_PACKAGE_UPDATES permission to Shell" into sc-dev am: 1d2cbb6f50
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15235316

Change-Id: Ia145803bd4b9db56e12833ec324a77d9fd313bf1
2021-07-09 11:42:34 +00:00
Louis Chang
cac8caf2bd Merge "Allow changing focus between embedded activities in a Task" into sc-v2-dev 2021-07-09 05:08:42 +00:00
Nikita Ioffe
65eb22cc56 Grant INSTALL_PACKAGE_UPDATES permission to Shell
Bug: 188062003
Test: m
Change-Id: I342f64e666afa4202b8af69f04d64b05d40fac40
2021-07-09 00:52:08 +01:00
Grace Cheng
be8d77ab5c Grants WRITE_SECURE_SETTINGS permission to AdasLocationTestApp
Test: manually.
Bug:191180940

Change-Id: I2bd96a9a87fdbb079b1182a4c36f5a212732447e
2021-07-08 23:44:14 +00:00
Chris Li
e7ed99bfc2 Merge "Remove TaskInfo#topActivityToken usage in size compat for security" into sc-dev 2021-07-08 18:05:40 +00:00
Chris Li
fc422208b1 Merge "Remove TaskInfo#topActivityToken usage in size compat for security" into sc-v2-dev am: 9d86a7b10f am: 7ee5c0b861
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15140327

Change-Id: I2ebd8ee5a949740f7faa6aae66f12e43d9b9cae5
2021-07-08 04:25:13 +00:00
Chris Li
1245aefa49 Remove TaskInfo#topActivityToken usage in size compat for security
Security report shows that this can cause leak token of different app.

Replace the functionality with a callback to the TaskOrganizerController
to restart activity when size compat restart button is clicked.

Bug: 186776724
Test: manually verify the restart button still works
Change-Id: I097b9f02e8435e6765695b9d5a531a4e165bac66
Merged-In: I097b9f02e8435e6765695b9d5a531a4e165bac66
2021-07-07 21:09:24 -07:00
Louis Chang
73d277117d Allow changing focus between embedded activities in a Task
The focused window was determined by looking up the focusable windows
from top to bottom.

In order to switch the focus between the embedded activities in the
same leaf Task without reordering the position of the activities, the
focused app can also be updated based on the window that user was
touched, and the focusable windows that were on other TaskFragment
in the same Task cannot be focused.

Bug: 189385926
Test: changing focused app by touching embedded activity
Change-Id: Id84461572cc768f474ffa313da1c10ff4010408e
2021-07-08 11:37:47 +08:00
Chris Li
ae54032e9a Remove TaskInfo#topActivityToken usage in size compat for security
Security report shows that this can cause leak token of different app.

Replace the functionality with a callback to the TaskOrganizerController
to restart activity when size compat restart button is clicked.

Bug: 186776724
Test: manually verify the restart button still works
Change-Id: I097b9f02e8435e6765695b9d5a531a4e165bac66
2021-07-07 12:50:53 -07:00
Rambo Wang
05e55c9e3e Support platform-compat-framework for TeleService
Bug: 191911306
Test: atest ServiceStateProviderTest
Change-Id: I23e0e0867c89c0e107258c723f29e9ae9b5ba9f1
2021-07-01 23:46:49 +00:00
TreeHugger Robot
4e4702891c Merge "Add READ_PRIVILEGED_PHONE_STATE to dialer" into sc-dev am: b3075bc5dc am: f7e2e6ffdd
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14908986

Change-Id: Ib327fc503fd8efb79f101e8650e85d8e168a03a5
2021-07-01 21:49:00 +00:00
TreeHugger Robot
dbd662eb1e Merge "Add READ_PRIVILEGED_PHONE_STATE to dialer" into sc-dev am: b3075bc5dc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14908986

Change-Id: Ib142f1e5a7df1631341295058a5a6a8660666b32
2021-07-01 21:48:48 +00:00
TreeHugger Robot
b3075bc5dc Merge "Add READ_PRIVILEGED_PHONE_STATE to dialer" into sc-dev 2021-07-01 21:45:06 +00:00
Neil Fuller
00d041c8fd Merge "Track changes in packages/services/Telephony" 2021-07-01 09:39:29 +00:00
TreeHugger Robot
ee9d0eb52a Merge "Give Shell the NOTIFY_PENDING_SYSTEM_UPDATE permission" into sc-dev am: 69a0939764 am: 79f30197dd
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15107816

Change-Id: Ie54a82c16b0d836ce56ef8d0c2469266275f00be
2021-06-29 17:28:19 +00:00
TreeHugger Robot
660f78ebf8 Merge "Give Shell the NOTIFY_PENDING_SYSTEM_UPDATE permission" into sc-dev am: 69a0939764
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15107816

Change-Id: If6acdea694ed3ba9972ec1bccd05b514a42125c3
2021-06-29 17:03:52 +00:00
TreeHugger Robot
69a0939764 Merge "Give Shell the NOTIFY_PENDING_SYSTEM_UPDATE permission" into sc-dev 2021-06-29 16:57:01 +00:00
Alex Kershaw
1f5ef8e31d Give Shell the NOTIFY_PENDING_SYSTEM_UPDATE permission
This is required for GTS testing it, rather than having to instrument
GMS Core.

Bug: 182271592
Test: tested as part of other CLs in this topic
Change-Id: Id56e0d206afe0a9069d1510a3dae9a07141fff60
2021-06-29 11:52:04 +01:00
Neil Fuller
97e8070613 Track changes in packages/services/Telephony
Track changes in packages/services/Telephony that remove
android.permission.SET_TIME_ZONE.

Bug: 192216373
Test: treehugger
Change-Id: I6135078cf35a682105324539b6798ec11b9f387c
2021-06-29 10:46:24 +01:00
Peter Li
8a21ab4d9b Add READ_PRIVILEGED_PHONE_STATE to dialer
Fix: 192017986
Bug: 188396041
Test: Manual

Change-Id: I5f85013c7373093030961392e61e86bc7376b346
2021-06-28 22:35:44 +00:00
TreeHugger Robot
720bf04dbf Merge "Allow Shell more permissions for TvInputManagerTest." into sc-dev am: 7058f9948f am: ab17fa366e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15098677

Change-Id: I08ac3647fdfaa0d2b328c30d1e5a8d16e1a0abf4
2021-06-28 11:39:10 +00:00
TreeHugger Robot
14b014a4a2 Merge "Allow Shell more permissions for TvInputManagerTest." into sc-dev am: 7058f9948f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15098677

Change-Id: Ia10e176ac85576cc4527f60642ea625b938f9895
2021-06-28 11:23:02 +00:00
Hongguang
757d741cd7 Allow Shell more permissions for TvInputManagerTest.
Bug: 171024152
Test: android.media.tv.cts.TvInputManagerTest
Change-Id: Iabea3ea72a5476892c848eaa8ebf4f93ad9b1000
2021-06-25 00:50:51 +00:00
Louis Chang
752fed1b01 Merge "Allowing leaf Task to contain both Activity and TaskFragment" into sc-v2-dev am: 7e4385baac am: 24d9f08450
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14957148

Change-Id: I5dcff5237c56d471cae0011040461e72f4f51ba1
2021-06-24 06:37:06 +00:00
Louis Chang
7e4385baac Merge "Allowing leaf Task to contain both Activity and TaskFragment" into sc-v2-dev 2021-06-24 06:09:15 +00:00
Louis Chang
28a72fbadb Allowing leaf Task to contain both Activity and TaskFragment
Allowing a leaf Task to both contains ActivityRecord and
TaskFragment as the direct children.

For example:
   Task
      - TaskFragment
         - Activity C
      - TaskFragment
         - Activity B
      - Activity A

Bug: 189385903
Test: wm presubmit
Change-Id: I79667df70dcbbefbf5a5cce1a24165247f403e69
2021-06-24 10:32:18 +08:00
Chris Li
6f08bac34a Merge changes from topic "task_fragment_organizer" into sc-v2-dev am: f555a8a0e6 am: a6e7ba9146
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14954952

Change-Id: Icb2704845a0f5fc1642297a8460dd3bb9cccff2d
2021-06-23 06:34:33 +00:00
Chris Li
cf717a20eb Add TaskFragmentOrganizer API
Mainly the API surface.

Bug: 190433129
Test: N/A
Change-Id: I426b7fdbe62d58213c5e49a4773dd5fda0eb4dfe
2021-06-22 15:54:38 -07:00
TreeHugger Robot
f8baad0b5b Merge "Enabling CAR_MONITOR_INPUT in com.android.car.rotary.xml" into sc-dev am: f92b5c4936 am: f84555c358
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15014590

Change-Id: Ibfcef164d28f06b12e6c359bf4b5f7a68f7600b7
2021-06-17 21:37:10 +00:00
TreeHugger Robot
ef59250e42 Merge "Enabling CAR_MONITOR_INPUT in com.android.car.rotary.xml" into sc-dev am: f92b5c4936
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15014590

Change-Id: I4e881d5335b07eb61a43de534c395549f4dce38a
2021-06-17 21:25:02 +00:00
TreeHugger Robot
f92b5c4936 Merge "Enabling CAR_MONITOR_INPUT in com.android.car.rotary.xml" into sc-dev 2021-06-17 20:50:27 +00:00
Antonio Kantek
4422c2ecb0 Enabling CAR_MONITOR_INPUT in com.android.car.rotary.xml
Bug: 191330748
Test: m -j32 (+ installed on seahawk)
Change-Id: I8721991a978bdbde7d6f6f852c55a0fb85634a84
2021-06-17 09:32:47 -07:00
Antonio Kantek
4f2bc338f7 Merge "Adding com.android.car.cluster.home.xml" into sc-dev am: 56330ddf59 am: 495883c461
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14910481

Change-Id: Ib41ab81ac9588d78fb4892886e6f46cc4926c3f5
2021-06-16 16:55:41 +00:00
Antonio Kantek
9541d7d67e Merge "Adding com.android.car.cluster.home.xml" into sc-dev am: 56330ddf59
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14910481

Change-Id: I977b80182255d652d65eeeb069d83547945eb936
2021-06-16 16:48:32 +00:00
Antonio Kantek
56330ddf59 Merge "Adding com.android.car.cluster.home.xml" into sc-dev 2021-06-16 16:31:31 +00:00
Vadim Caen
39b397de9f Merge "Release the SurfacePackageViewHost on splash screen removed" into sc-dev am: dc07d29bd0 am: e65475b1c6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14775423

Change-Id: I675fd44270a6a59863a2490e3723f0f53379b3c5
2021-06-16 12:42:44 +00:00
Vadim Caen
ab9a4b9a5a Merge "Release the SurfacePackageViewHost on splash screen removed" into sc-dev am: dc07d29bd0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14775423

Change-Id: I41c53ecabb544054bbe522baf5ffddaac211975b
2021-06-16 12:31:00 +00:00
Antonio Kantek
8e3082fbcd Adding com.android.car.cluster.home.xml
This is required in order to build ClusterHomeSample with CAR_MONITOR_INPUT privileged permission.

Bug: 186676333
Test: atest CarServiceUnitTest
Change-Id: Ie5c81beb142c8f02aa01bdf129320169eed2c00e
2021-06-15 15:02:16 -07:00