Commit Graph

2397 Commits

Author SHA1 Message Date
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
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
2bf493a69c Merge "Add multi-display support to shell transitions" into sc-v2-dev am: 2f7eef8248
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14950060

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

Change-Id: I9be9166c44a2a9761b422c3ed8c3f5bbb149b76a
2021-07-12 20:26:03 +00:00
Nikita Ioffe
c542c51ced Merge "Grant INSTALL_PACKAGE_UPDATES permission to Shell" into sc-dev am: 1d2cbb6f50 am: 454d31beff
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15235316

Change-Id: Ibb39e277acc77d6f2aa33c18d4de4807293e4271
2021-07-12 20:20:24 +00:00
Nikita Ioffe
ffcc75b181 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: I4f39d26a3c086f186240411e31052011a262b963
2021-07-12 20:19:21 +00:00
Louis Chang
b13e5c5fe2 Merge "Allow changing focus between embedded activities in a Task" into sc-v2-dev am: cac8caf2bd
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15127230

Change-Id: Icbb674d9a3e50e30cb546378b736607fb9dd4b5b
2021-07-12 20:18:25 +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
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
0a703480d2 Merge "Remove TaskInfo#topActivityToken usage in size compat for security" into sc-dev am: e7ed99bfc2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15156978

Change-Id: Ieaa6eb5bc5dc023644d4f6c19dbb583f7e022f5b
2021-07-08 18:15:42 +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
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
Chris Li
7ee5c0b861 Merge "Remove TaskInfo#topActivityToken usage in size compat for security" into sc-v2-dev am: 9d86a7b10f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15140327

Change-Id: I055350435baff2260423ab43c0667009034033f7
2021-07-08 04:06:42 +00: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
48f1a8e2c7 Merge "Add READ_PRIVILEGED_PHONE_STATE to dialer" into sc-dev am: b3075bc5dc am: ca58abc4a9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14908986

Change-Id: I11503756233e95d969ed17ba7101964ed724e13d
2021-07-01 21:52:36 +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
ca58abc4a9 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: Iba83b43c726dfb1fd834a74922fe8c44751f0c6a
2021-07-01 21:48:37 +00:00
TreeHugger Robot
b3075bc5dc Merge "Add READ_PRIVILEGED_PHONE_STATE to dialer" into sc-dev 2021-07-01 21:45:06 +00:00
TreeHugger Robot
80a143244d Merge "Give Shell the NOTIFY_PENDING_SYSTEM_UPDATE permission" into sc-dev am: 69a0939764 am: 866fdeaa20
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15107816

Change-Id: I460683e08c7a1f15e775138067bede0fc8bcbc24
2021-06-29 17:04:39 +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
866fdeaa20 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: I6a58650e3553227b5a858a0dbb26d2c0a1380a9a
2021-06-29 17:03:50 +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
Kohsuke Yatoh
a50fdd1304 Merge "Extract flag font from NotoColorEmoji" into sc-dev am: 80a8cf86c0 am: 0a93841c46
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14970179

Change-Id: Ibdf0759b458a8106f54ab61454ca1885ba57272b
2021-06-29 01:13:08 +00:00
Kohsuke Yatoh
200f796356 Merge "Extract flag font from NotoColorEmoji" into sc-dev am: 80a8cf86c0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14970179

Change-Id: If931b95a73d977ee2bd7d0389e7a78d5b1dca2b2
2021-06-29 00:57:43 +00:00
Kohsuke Yatoh
0a93841c46 Merge "Extract flag font from NotoColorEmoji" into sc-dev am: 80a8cf86c0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14970179

Change-Id: If11584176cfc18d8580dc021fabf6fb8445b1cdc
2021-06-29 00:56:10 +00:00
Kohsuke Yatoh
80a8cf86c0 Merge "Extract flag font from NotoColorEmoji" into sc-dev 2021-06-29 00:40:27 +00: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
bb0ca9c6ac Merge "Rename keylayout for SnakeByte iDroid:con to match by name" into sc-dev am: e4147d7370
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15120883

Change-Id: I0f96ac99c0714ec07a055d3428065ae50658cc90
2021-06-28 13:22:42 +00:00
TreeHugger Robot
e4147d7370 Merge "Rename keylayout for SnakeByte iDroid:con to match by name" into sc-dev 2021-06-28 13:10:02 +00:00
TreeHugger Robot
3d7303183e Merge "Allow Shell more permissions for TvInputManagerTest." into sc-dev am: 7058f9948f am: 14b014a4a2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15098677

Change-Id: Ifda3cc6db55d87a069583ee96a22ae45c5e865e4
2021-06-28 11:39:40 +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
TreeHugger Robot
849af2a984 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: If58599b99b81fb0a5272c02ee16354b697156c47
2021-06-28 11:21:46 +00:00
Treehugger Robot
6853c263e9 Rename keylayout for SnakeByte iDroid:con to match by name
This keylayout was introduced in ba81efe04a.
Unfortunately, we cannot match by vid / pid, since this breaks other
devices (like keyboards) that use the same vendor / product id.

Instead, match by name to avoid conflict.

Bug: 191720859
Change-Id: I9dd686ebcd612ca04d41b7b5cadf8442350346c9
Merged-In: I9dd686ebcd612ca04d41b7b5cadf8442350346c9
Test: verified manually
2021-06-27 08:09:21 +00:00
Treehugger Robot
5d0abebe72 Merge "Rename keylayout for SnakeByte iDroid:con to match by name" am: 8bae06f66d am: 637694588b am: dcc5f5e7da
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1747153

Change-Id: Ieb9dccbb8f2ecfe4baf5c75891d8625c63df0991
2021-06-27 01:01:27 +00:00
Treehugger Robot
dcc5f5e7da Merge "Rename keylayout for SnakeByte iDroid:con to match by name" am: 8bae06f66d am: 637694588b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1747153

Change-Id: I29016ef674e91e31c4e8b5f5eb4db32148187805
2021-06-27 00:39:47 +00:00
Treehugger Robot
8bae06f66d Merge "Rename keylayout for SnakeByte iDroid:con to match by name" 2021-06-26 23:41:49 +00:00
Siarhei Vishniakou
ce40a4d0e8 Rename keylayout for SnakeByte iDroid:con to match by name
This keylayout was introduced in ba81efe04a.
Unfortunately, we cannot match by vid / pid, since this breaks other
devices (like keyboards) that use the same vendor / product id.

Instead, match by name to avoid conflict.

Bug: 191720859
Change-Id: I9dd686ebcd612ca04d41b7b5cadf8442350346c9
Test: verified manually
2021-06-25 17:14:21 +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
Seigo Nonaka
458f1dd71c Extract flag font from NotoColorEmoji
Bug: 188926991
Bug: 188779144
Test: m fontchain_lint
Change-Id: Ie807e31abb407f5b58665d4d2941bc75186d5c42
Merged-In: Ie807e31abb407f5b58665d4d2941bc75186d5c42
2021-06-24 18:46:08 +00:00
Louis Chang
24d9f08450 Merge "Allowing leaf Task to contain both Activity and TaskFragment" into sc-v2-dev am: 7e4385baac
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14957148

Change-Id: If3fca87e2aba9798f5b45a3cc46d73b1f70410ac
2021-06-24 06:19:37 +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