Commit Graph

19977 Commits

Author SHA1 Message Date
Mariia Sandrikova
546983419c Merge "Configurable letterbox background." into sc-dev 2021-02-03 11:50:38 +00:00
Junyu Lai
91d89b4880 Merge "[FUI21] Move scrubSubscriberId to utils class" am: f6c7f61d27 am: f0b03b1763 am: 582c042052
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1565195

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If957a1c5017ab9600bbdece527543885a17ed2aa
2021-02-03 10:25:20 +00:00
Junyu Lai
582c042052 Merge "[FUI21] Move scrubSubscriberId to utils class" am: f6c7f61d27 am: f0b03b1763
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1565195

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I59c31da9c2ba69ee74cbf64e3af42331e9b7bfca
2021-02-03 10:10:22 +00:00
Junyu Lai
f6c7f61d27 Merge "[FUI21] Move scrubSubscriberId to utils class" 2021-02-03 08:52:17 +00:00
TreeHugger Robot
e51a931cd2 Merge "Cache permission policy" into sc-dev 2021-02-03 06:41:02 +00:00
Riddle Hsu
6ab44a81d6 Merge "Restore overridePendingTransition to a sync binder call" into sc-dev 2021-02-03 03:05:20 +00:00
TreeHugger Robot
5e1f9a630b Merge "Pass in split permissions to ParsingPackageUtils." into sc-dev 2021-02-03 00:34:44 +00:00
Chris Li
ee21983ae0 Merge "Allow non-resizable apps in split-screen (7/n)" into sc-dev 2021-02-03 00:24:54 +00:00
Mariia Sandrikova
c0f663fd35 Configurable letterbox background.
Allow three types of the letterbox wallpaper:
- Solid background using color specified in R.color.config_letterboxBackgroundColorSolid color
- Color specified in R.attr.colorBackground for the letterboxed application
- Color specified in R.attr.colorBackgroundFloating for the letterboxed application

Also, adding ADB commands for each config value:
- adb shell cmd window set-letterbox-background-color [reset|color]
- adb shell cmd window get-letterbox-background-color
- adb shell cmd window set-letterbox-background-type [reset|solid_color|app_color_background|app_color_background_floating]
- adb shell cmd window get-letterbox-background-type

Test: manual with ADB commands, atest LetterboxTest
Fix: 179088234
Change-Id: I23cf0b52c9f95d1f92255731bc7be165a575c7cd
2021-02-02 23:54:25 +00:00
TreeHugger Robot
e7a937b035 Merge "Clean up split system user code for device policy management" into sc-dev 2021-02-02 21:56:08 +00:00
Shashwat Razdan
ae26632fa2 Merge "Adding owners in smartspace packages" am: 10603d5102 am: 6bef558283 am: 5a53f7c676
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1570760

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ideffda52245794487ac6289f4046b88aab941e93
2021-02-02 21:52:24 +00:00
Shashwat Razdan
5a53f7c676 Merge "Adding owners in smartspace packages" am: 10603d5102 am: 6bef558283
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1570760

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9670927375fa2cbb52a8d7114b41d9475dcc7b7e
2021-02-02 21:02:27 +00:00
Chris Li
98d2d06106 Allow non-resizable apps in split-screen (7/n)
Add interface for SizeCompatUIController in WM shell to use
when refactoring SizeCompatModeActivityController from system UI.

Bug: 176061101
Bug: 178327644
Test: atest WMShellUnitTests:ShellTaskOrganizerTests
Change-Id: I37f72396e1769b7773722be6575506fc430b2739
2021-02-02 12:50:28 -08:00
Hai Zhang
f61f4fb849 Pass in split permissions to ParsingPackageUtils.
Similar to passing in display metrics. We can use
ActivityThread.currentApplication() as the context for getting
PermissionManager in system server process because it will be created
early in ActivityThread.attach() before any custom logic can run, but
it becomes a problem for apps because they can run their own logic by
overriding Application.attachBaseContext() and do things there before
ActivityThread.currentApplication() becomes non-null.

So pass in the split permissions explicitly as an external dependency
for ParsingPackageUtils, and move the getPackageArchiveInfo()
implementation from PackageManager to ApplicationPackageManager to
utilize the context there. PackageParser2 can get the split
permissions internally because it's only used in system server.

Fixes: 178155985
Test: manual
Change-Id: I8213cf752e16b08328ad1150b2639da18c5d0e83
(cherry picked from commit 7b8974d375)
2021-02-02 11:42:40 -08:00
TreeHugger Robot
b23f6d71ee Merge "Move GameManager to android.app package." into sc-dev 2021-02-02 19:36:13 +00:00
Shashwat Razdan
057896ae34 Adding owners in smartspace packages
Test: not needed as this is a meta file change

Change-Id: I32f5205c4c1b771aae963a20e9a52fa7691ce271
2021-02-02 17:50:18 +00:00
Yan Zhu
3ea0eb2bf8 Clean up split system user code for device policy management
Bug: 137101239
Test: build, sync and reboot
m update-api -j64 && m
atest FrameworksServicesTests:com.android.server.devicepolicy.DevicePolicyManagerTest

Merged-In: Ibc642c04d3dcba84cd9837efb09cde04b46ff620
Change-Id: Ibc642c04d3dcba84cd9837efb09cde04b46ff620
(cherry picked from commit 8f9193aed0)
2021-02-02 09:00:08 -08:00
Eran Messeri
e02d4e358b Cache permission policy
Since the Permission Controller calls into DPM, to avoid a potential
circular dependency (where the DPMS holds a lock while the Permission
Controller calls it), cache the permission policy.

Bug: 158735247
Test: atest com.android.cts.devicepolicy.MixedProfileOwnerTest#testDelegation com.android.cts.devicepolicy.MixedDeviceOwnerTest#testDelegation com.android.cts.devicepolicy.MixedManagedProfileOwnerTest#testDelegation
Test: atest com.android.cts.devicepolicy.MixedProfileOwnerTest#testPermissionAppUpdate com.android.cts.devicepolicy.MixedProfileOwnerTest#testPermissionPolicy com.android.cts.devicepolicy.MixedDeviceOwnerTest#testPermissionAppUpdate com.android.cts.devicepolicy.MixedDeviceOwnerTest#testPermissionPolicy com.android.cts.devicepolicy.MixedManagedProfileOwnerTest#testPermissionAppUpdate com.android.cts.devicepolicy.MixedManagedProfileOwnerTest#testPermissionPolicy
Change-Id: I6cfc027b063f43053d1ff4cc42d37935491064ff
2021-02-02 16:13:29 +00:00
junyulai
c59f67a79c [FUI21] Move scrubSubscriberId to utils class
This patch also removes the functionality of returning
original subscriberId in eng build since it is not really useful.

Test: atest NetworkIdentityUtilsTest
Bug: 174123988
Change-Id: I721457e571aa9403a2200b3e4261b4895e4f7a3e
2021-02-02 23:45:54 +08:00
Shashwat Razdan
fc890f1fba Merge "SmartspaceManager initial implementation" into sc-dev 2021-02-02 12:31:26 +00:00
Riddle Hsu
3a1d026bd4 Restore overridePendingTransition to a sync binder call
Otherwise the calling activity is not blocked and can proceed
to change activity state, that may cause the override request
to be dropped. In addition, it is usually called after
startActivity and finish which are non-one-way binder calls.
The order also needs to be guaranteed to make the override
take effect.

Bug: 161781274
Bug: 179008865
Test: WindowUntrustedTouchTest# \
      testWhenExitAnimationAboveThresholdFromSameUid_allowsTouch
Change-Id: I7ca018a934972c195040f2a9f63a18a59dce9c48
2021-02-02 10:15:16 +00:00
Adrian Roos
84199909eb Merge changes from topic "nullablecollection" into sc-dev
* changes:
  API: Suppress existing NullableCollections lints (TaskOrganizer)
  API: Suppress existing NullableCollections lints (S edition)
2021-02-02 09:24:38 +00:00
Donald Chai
9154c8febe Merge "Fix typo in comment." am: 182e90d1ea am: 2a0adcf0c6 am: 2b6eebf16d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1569600

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7b0cbedae16e9efbc88521901cb225c1b5e64f58
2021-02-02 07:12:02 +00:00
Donald Chai
2b6eebf16d Merge "Fix typo in comment." am: 182e90d1ea am: 2a0adcf0c6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1569600

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I314a3e97c4683dddb0ced5f5368e01586eea9919
2021-02-02 06:47:26 +00:00
Treehugger Robot
f602685a70 Merge "Have connectivity self-register manager classes" am: 4ad0fdc5c9 am: 98c48f7101 am: f99ed40471
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552657

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7a664bb9e9f2f835f148d0102f8b53c010bb7791
2021-02-02 06:40:07 +00:00
Donald Chai
182e90d1ea Merge "Fix typo in comment." 2021-02-02 06:07:18 +00:00
Treehugger Robot
f99ed40471 Merge "Have connectivity self-register manager classes" am: 4ad0fdc5c9 am: 98c48f7101
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552657

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I512f95a45ab23d4b7e03c196850d0dab75223620
2021-02-02 06:07:13 +00:00
Donald Chai
5f3a83529c Fix typo in comment.
Change-Id: Ie35db2cfef32543e573bf701d2d523f5f1502161
Tested: N/A
2021-02-02 03:58:05 +00:00
Shashwat Razdan
d33e8c387a SmartspaceManager initial implementation
Bug: 176851064
Test: Deployed on Phone,CTS tests
Change-Id: I3e03628d4d0e0aec0b6442f0ee8949ac378a1572
2021-02-01 21:39:07 +00:00
TreeHugger Robot
772cd3678c Merge "Adding APIs to get manifest entries for Launcher activities and widgets and getting resources for a particular config" into sc-dev 2021-02-01 19:37:15 +00:00
Chris Li
0838b40ec8 Merge "Allow non-resizable apps in split-screen (6/n)" into sc-dev 2021-02-01 17:49:52 +00:00
Sunny Goyal
7152080c07 Adding APIs to get manifest entries for Launcher activities and widgets
and getting resources for a particular config

This would allow fetching display infos for the activity in a particular
config independent of system config.

Bug: 156154533
Test: Included CTS
Change-Id: Ie245d685fb21444c10a88b4ca86dc7ff08e2b599
Merged-In: Ie245d685fb21444c10a88b4ca86dc7ff08e2b599
2021-02-01 17:35:23 +00:00
Adrian Roos
d7f33cd648 API: Suppress existing NullableCollections lints (S edition)
Bug: 152525509
Test: make checkapi
Change-Id: Idf96709bf93ef49ca5ad3cdd1f14d06e0d9e09d7
Exempt-From-Owner-Approval: API lint large scale change
2021-02-01 14:54:34 +00:00
Remi NGUYEN VAN
b74c92e2a8 Have connectivity self-register manager classes
As connectivity services are planned to move to a separate module, move
the manager classes registration from SystemServiceRegistry to
ConnectivityServicesRegistrar, using the registerContextAwareService
APIs.

This follows patterns and naming in WifiFrameworkInitializer.

Bug: 171540887
Test: device boots, connectivity working
Change-Id: I62ced1275750c73f209bac8ec3a3204b95695b83
2021-02-01 17:10:39 +09:00
Chris Li
acbe872a5f Allow non-resizable apps in split-screen (6/n)
Trigger TaskInfoChanged when the direct top Activity of the organized
Task enters or exits size compat mode.

This is the prerequisite to move SizeCompatModeActivityController from
system ui to shell. After that, we can render the size compat restart
button on Task Surface similar to split screen divider.

Bug: 176061101
Bug: 178327644
Test: atest WmTests:SizeCompatTests
Test: atest WmTests:WindowOrganizerTests
Change-Id: I0e328796095bc17d40a5ef2f354f291c12ffa04a
2021-01-31 17:58:59 -08:00
Jin Seok Park
2102bd8448 Merge "Expose PendingIntent APIs for exposing component/type for CTS" into sc-dev 2021-01-30 17:01:40 +00:00
Peiyong Lin
235cb5086c Move GameManager to android.app package.
Bug: b/177611751
Bug: b/178112303
Test: atest GameManagerTests
Test: atest GameManagerServiceTests
Test: atest GameManagerServiceSettingsTests
Change-Id: Icf01f723f1323f6f91030e6005958b7da05e8177
2021-01-29 20:58:52 -08:00
Peiyong Lin
72036e758c Merge "Add GameManager service." into sc-dev 2021-01-29 23:47:19 +00:00
Treehugger Robot
4269d500bc Merge "add ownership" am: c63817d8f0 am: b327283c1d am: c352f6cded
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1563872

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3aab719f7d71fb4a16400f4b89cbd0a705ac31c8
2021-01-29 23:38:32 +00:00
Treehugger Robot
c352f6cded Merge "add ownership" am: c63817d8f0 am: b327283c1d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1563872

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I843daa05b152bc2fdd2b51f6e7038df98a54e3d6
2021-01-29 23:22:13 +00:00
Anna Zappone
1389c8ce62 Merge "Expose new PeopleService API for People Tiles" into sc-dev 2021-01-29 18:03:55 +00:00
Peiyong Lin
32f6ff7e15 Add GameManager service.
GameManager service is a service to manage game related features. This
patch creates the initial service to manage the game mode and persist
the data across reboot.

Bug: b/174956354
Test: atest GameManagerTests
Test: atest GameManagerServiceTests
Test: atest GameManagerServiceSettingsTests
Change-Id: Iee2ab47c79d29f48847bc6d4b3eb781a5af18ff4
2021-01-29 09:18:34 -08:00
Anna Zappone
30ebaa214a Expose new PeopleService API for People Tiles
Avoid over-querying data by returning a single ConversationChannel when
requested by shortcut ID.

Test: DataManagerTest
Bug: 178792356
Change-Id: I181682b70022d1ce0b055ce1e7c97f5b84c6f1f0
(cherry picked from commit d546f62063)
2021-01-29 14:49:55 +00:00
Jin Seok Park
ecbb7319f8 Expose PendingIntent APIs for exposing component/type for CTS
Bug: 177701160
Test: atest CtsAppTestCases:android.app.cts.PendingIntentTest
      #testGetIntentComponentAndType
Change-Id: I7d57f44cf5d79debb776fa93e9e97b919eb5252e
2021-01-29 06:43:43 +00:00
Jeff DeCew
604fa4df22 Fix notification time text color
Fixes: 178725891
Test: manual
Change-Id: I2485bf1995945038ae076abe372b2e8da1921023
2021-01-28 16:55:46 -05:00
Todd Kennedy
c57585bd25 add ownership
Change-Id: I1399a560422d2138c1480d02e099b387a74c6800
2021-01-28 16:58:08 +00:00
Riddle Hsu
f74209c9b5 Merge "Restore activityPaused to a sync binder call" into sc-dev 2021-01-28 12:16:30 +00:00
TreeHugger Robot
0290ef235c Merge "Add traces for activity create/resume/pause/stop/destroy" into sc-dev 2021-01-28 10:20:28 +00:00
Riddle Hsu
3586e9212f Restore activityPaused to a sync binder call
The intention of previous one-way change is to reduce blocking
call on client side. But in most of cases the blocking of
activityPaused is no harm for the app. Because either the app
is going to background or it launches another activity in the
same process. If the case is the latter, the creation of next
activity is still scheduled after activityPaused is done.

Some apps may even use Idler to start some post initialization.
They assume the timing of idle will happen after the whole
consecutive launch in the same process. Then the non-blocking
call may break their assumption that the idle event is triggered
earlier.

Bug: 161781274
Bug: 178005687
Test: CtsWindowManagerDeviceTestCases
Test: In the onCreate of first activity, start the second activity
      and set an Idler on UI thread. The Idler should be called
      after the second activity is launched.

Change-Id: Ib256d0a534fedb0b39f2825f4deb2f8c81e857be
2021-01-28 16:10:21 +08:00
TreeHugger Robot
e95f58c7bd Merge "Implement the behavior after receiving auto translation request." into sc-dev 2021-01-28 06:28:49 +00:00