Commit Graph

20712 Commits

Author SHA1 Message Date
Antoan Angelov
e48afe6e1b Merge "Update EXTRA_PROVISIONING_SUPPORTED_MODES values to flags" into sc-dev am: f78b620609
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14104346

Change-Id: I75ab5dccab92cb684b59358ab3de7eabde9d6dc4
2021-04-14 14:23:28 +00:00
Antoan Angelov
f78b620609 Merge "Update EXTRA_PROVISIONING_SUPPORTED_MODES values to flags" into sc-dev 2021-04-14 14:08:19 +00:00
Jeff DeCew
3b0078c57e Merge "Clean up MessagingLayout notifications" into sc-dev am: 42cef834c7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14106007

Change-Id: Idb03dffc18dfe460e3425a68b8037593745508e6
2021-04-14 13:32:49 +00:00
Jeff DeCew
42cef834c7 Merge "Clean up MessagingLayout notifications" into sc-dev 2021-04-14 12:47:24 +00:00
Pavel Grafov
9935f339a1 Merge "API review: change getKeyPairGrants return type" into sc-dev am: 7ecbda5d91
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14141489

Change-Id: If601fbd2a5b1c0fa6a670f17a7e60ba0298ae3b0
2021-04-14 10:29:29 +00:00
Pavel Grafov
7ecbda5d91 Merge "API review: change getKeyPairGrants return type" into sc-dev 2021-04-14 09:58:49 +00:00
Paul Hu
2da0b40c98 Merge "Add [get|set]MaxManifestReceiverApiLevel to test api for CTS" into sc-dev am: 68c58b9ccd
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14161095

Change-Id: Ide6860fbe5ed06e717b72b25f24481bf62fb7ec5
2021-04-14 04:56:04 +00:00
Paul Hu
68c58b9ccd Merge "Add [get|set]MaxManifestReceiverApiLevel to test api for CTS" into sc-dev 2021-04-14 04:52:38 +00:00
Jeff DeCew
0628846bfa Merge "Add CallStyle.setIsVideo(boolean)" into sc-dev am: f9139ded2a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14130088

Change-Id: I443153869872912e785f56b98705fa0d8a2f4df5
2021-04-14 00:48:34 +00:00
Jeff DeCew
f9139ded2a Merge "Add CallStyle.setIsVideo(boolean)" into sc-dev 2021-04-14 00:37:12 +00:00
Suprabh Shukla
1698c0705e Merge "Suspend dialog improvememts" into sc-dev am: 9da117df72
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14150368

Change-Id: Icda2d764a05d9ec22cf7622a731cd94040e559c0
2021-04-14 00:08:56 +00:00
Suprabh Shukla
9da117df72 Merge "Suspend dialog improvememts" into sc-dev 2021-04-13 23:57:38 +00:00
Zhen Zhang
e7fd299c0a Merge "Rename API based on API review" into sc-dev am: c7c816a951
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14131577

Change-Id: I93d15f5f03bfe6d8fcdbe2f0342203e20ac93404
2021-04-13 20:41:01 +00:00
Zhen Zhang
c7c816a951 Merge "Rename API based on API review" into sc-dev 2021-04-13 20:07:53 +00:00
Charles Chen
ddb4c83f18 Merge "Enable WindowContext to associate with WindowToken" into sc-dev am: 030a75463e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14018005

Change-Id: I292abff399ff48f43a5d99b3033ad900c15b9d5c
2021-04-13 15:00:48 +00:00
Charles Chen
030a75463e Merge "Enable WindowContext to associate with WindowToken" into sc-dev 2021-04-13 14:29:44 +00:00
Charles Chen
a5b660e386 Enable WindowContext to associate with WindowToken
This CL instroduces WMS#attachWindowContextToWindowToken
and the corresponding API in WindowContextController to make
WindowContext able to associate with a WindowToken.

Test: atest WindowContextControllerTest
Test: atest WindowManagerServiceTests#testAttachWindowContextToWindowToken*
Bug: 159767464

Change-Id: I807a67fba149cbdc4267442bab0b64e6a95bd4b5
2021-04-13 15:55:49 +08:00
Riddle Hsu
b335bf1179 Merge "Remove obsolete test APIs of split screen" into sc-dev am: a77a0600cf
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14159585

Change-Id: Id81fb990ddb876c767e01232b4e8c70e2cf3f201
2021-04-13 02:41:06 +00:00
Riddle Hsu
a77a0600cf Merge "Remove obsolete test APIs of split screen" into sc-dev 2021-04-13 02:20:37 +00:00
Suprabh Shukla
346118543b Suspend dialog improvememts
Finishing the suspend dialog when the package for which it was shown
gets unsuspended for any reason.

Also, attributing any interaction with this dialog to the suspending
package, as the system is showing the dialog on its behalf.

Test: Manual, from an unrooted shell:
adb shell pm suspend com.android.chrome
Tap to start chrome and wait for the dialog to appear. Then:
adb shell pm unsuspend com.android.chrome
The dialog should disappear. Further,
adb shell dumpsys usagestats
should show USER_INTERACTION for com.android.shell.

Bug: 169137795
Fixes: 180336589
Change-Id: I70b6f23e2994d8802335e35932ed09209754697c
2021-04-12 19:10:31 -07:00
paulhu
4c7720ba86 Add [get|set]MaxManifestReceiverApiLevel to test api for CTS
Bug: 185184155
Test: m update-api
Change-Id: I73087f071e9cff7fd88e137eac8993738589772c
2021-04-13 09:41:30 +08:00
Meng Wang
f8c331bc49 Merge "Revert "PasswordPolicy.getMinMetrics PIN"" into sc-dev am: 6517e68d15
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14163097

Change-Id: I4710b1aa328571550ecee6bea8fc1b4ca32a58c6
2021-04-12 23:44:28 +00:00
Meng Wang
6517e68d15 Merge "Revert "PasswordPolicy.getMinMetrics PIN"" into sc-dev 2021-04-12 23:22:21 +00:00
Meng Wang
3c167fe9ca Revert "PasswordPolicy.getMinMetrics PIN"
This reverts commit 8dd5021359.

Reason for revert: DroidMonitor: Potential culprit for Bug 185150796 - verifying through Forrest before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Bug: 185150796
Change-Id: Ie6809d9e20b5c32c076e7a790095c65a2295781a
2021-04-12 22:26:57 +00:00
Felipe Leme
de48cdeecc Merge "Documents that wipeData() is allowed for apps with MASTER_CLEAR permission." into sc-dev am: 6ebf3703f2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14130357

Change-Id: I32f98f893c1c18fb3f6a88dd1e46797f3feea006
2021-04-12 20:54:49 +00:00
Felipe Leme
6ebf3703f2 Merge "Documents that wipeData() is allowed for apps with MASTER_CLEAR permission." into sc-dev 2021-04-12 20:29:04 +00:00
Chloris Kuo
fa06698519 Merge "NAS Settings Migration" into sc-dev am: cfab1005d3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13931022

Change-Id: I44e2ceb029c6b69aacc921c3ac69d925352c3456
2021-04-12 17:43:18 +00:00
Chloris Kuo
cfab1005d3 Merge "NAS Settings Migration" into sc-dev 2021-04-12 17:16:57 +00:00
Alex Johnston
61e5fada68 Merge "PasswordPolicy.getMinMetrics PIN" into sc-dev am: 60e65b4b6f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14127229

Change-Id: I23196e83b7c979f82a46c5c314509bd62491c5b3
2021-04-12 16:15:22 +00:00
Alex Johnston
60e65b4b6f Merge "PasswordPolicy.getMinMetrics PIN" into sc-dev 2021-04-12 15:45:06 +00:00
Mady Mellor
0102e85755 Merge "API Update: extra_is_bubbled -> Activity#isLaunchedFromBubble" into sc-dev am: 02b75bb425
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13891125

Change-Id: Id00e94bfffbe480f56dfc35a73c3eb5e49541302
2021-04-12 15:10:47 +00:00
Mady Mellor
02b75bb425 Merge "API Update: extra_is_bubbled -> Activity#isLaunchedFromBubble" into sc-dev 2021-04-12 14:53:01 +00:00
arangelov
7bfdde8171 Update EXTRA_PROVISIONING_SUPPORTED_MODES values to flags
This addresses API council feedback.

SUPPORTED_MODES_ORGANIZATION_OWNED is now
FLAG_SUPPORTED_MODES_ORGANIZATION_OWNED.
SUPPORTED_MODES_PERSONALLY_OWNED is
FLAG_SUPPORTED_MODES_PERSONALLY_OWNED.
SUPPORTED_MODES_DEVICE_OWNER is
FLAG_SUPPORTED_MODES_DEVICE_OWNER.

SUPPORTED_MODES_ORGANIZATION_AND_PERSONALLY_OWNED is now
FLAG_SUPPORTED_MODES_ORGANIZATION_OWNED |
FLAG_SUPPORTED_MODES_PERSONALLY_OWNED.

Note that these new flags have the same exact values as
the original values, so no changes are needed to be done
for the provisioning trigger.

Fixes: 179709752
Test: atest ManagedProvisioningTests
Test: atest ManagedProvisioningRoboTests
Change-Id: I1845837e752df5750083dc3bf31cbc356f4d24b7
2021-04-12 15:10:09 +01:00
Eran Messeri
78f5993941 Merge "Rename Enterprise Network Preference to Preferential network service" into sc-dev am: b056b2c7bc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14104354

Change-Id: I1bde8c9062def06f72a0a1ddd6c3204f33e89089
2021-04-12 13:19:19 +00:00
Eran Messeri
b056b2c7bc Merge "Rename Enterprise Network Preference to Preferential network service" into sc-dev 2021-04-12 13:02:25 +00:00
Pavel Grafov
a049f622da API review: change getKeyPairGrants return type
Currently getKeyPairGrants returns Set<Set<String>> which is used
to encode the fact that packages that share UID will always have
access to a given key together. This change makes this UID explicit
by changing return value to Map<Integer, Set<String>>.

Bug: 184018067
Test: atest MixedDeviceOwnerTest#testDelegatedCertInstallerDirectly
Test: atest MixedDeviceOwnerTest#testKeyManagement
Change-Id: I571e67bda1709ddb48012003de055c7211edb786
2021-04-12 12:08:23 +01:00
Riddle Hsu
f6da995b05 Remove obsolete test APIs of split screen
The methods setTaskWindowingMode and resizePrimarySplitScreen
can be replaced with the methods of WindowContainerTransaction
and TaskOrganizer.

Bug: 174040691
Test: CtsWindowManagerDeviceTestCases

Change-Id: I975457887a87464456675010c7531738fa5f62f4
2021-04-12 17:47:37 +08:00
Eran Messeri
aec6d44203 Merge "Address API review for admin-granted permissions" into sc-dev am: 9ac9fe53bf
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14104359

Change-Id: I73e451c7ed8ffe673f78335bc2493c38a6345f5b
2021-04-11 11:46:30 +00:00
Eran Messeri
9ac9fe53bf Merge "Address API review for admin-granted permissions" into sc-dev 2021-04-11 11:44:26 +00:00
Jimmy Shiu
afe79043a8 ADPF: PerformanceHintManager API implementation am: 4c6e5036b7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13699259

Change-Id: I4a1a0b654d38beba814ca968276675358c8d9331
2021-04-11 00:49:06 +00:00
Jimmy Shiu
4c6e5036b7 ADPF: PerformanceHintManager API implementation
Test: Manual test, run bouncy ball
Test: atest FrameworksCoreTests:android.os.PerformanceHintManagerTest
Bug: 158791282
Change-Id: Ia0bf2b06675b8cf57cdf1668ee90e98026416439
Signed-off-by: Wei Wang <wvw@google.com>
2021-04-10 10:21:17 -07:00
Rubin Xu
93cb6f68a6 Merge "Recognize numeric PIN in resetPasswordWithToken()" into sc-dev am: 2c34160c28
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14140065

Change-Id: Ia6ddfa08dbd7333ce6a61fdf338ffffa9f88b117
2021-04-09 23:59:23 +00:00
Rubin Xu
2c34160c28 Merge "Recognize numeric PIN in resetPasswordWithToken()" into sc-dev 2021-04-09 23:21:18 +00:00
Chloris Kuo
3f03f51421 NAS Settings Migration
Change default NAS to AiAi for Pixel devices

Bug: 173106358
Test: manually on device, atest
Change-Id: I2fe0b3eed479188509df5ce65d1b2a1281e6c85a
2021-04-09 11:21:33 -07:00
Mady Mellor
9eb5acf450 Merge "API feedback: setSuppressableBubble/setSuppressBubble" into sc-dev am: 3c0890601d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14129885

Change-Id: I023ebcfe9e5a3201027ffd580694e3617becba2a
2021-04-09 17:52:25 +00:00
Mady Mellor
3c0890601d Merge "API feedback: setSuppressableBubble/setSuppressBubble" into sc-dev 2021-04-09 17:49:12 +00:00
Jeff DeCew
f82dcec612 Clean up MessagingLayout notifications
* Collapsed state now appears with the 'headerless' style used for all other collapsed notification templates (except conversations / calls which have their own style).
* Expanded state contnues to use the 'header' treatment of all our big states, but messaging faces will now appear in the left icon gutter, and text will always align with other styles.
* Image messages show up in the 'right icon' location when collapsed, but will not be moved to the 'left icon' when grouped.
* 1-1 conversations will highlight the other user's name as the title, in the collapsed state.

Fixes: 173204301
Test: post and inspect lots of messaging notifications
Change-Id: I5a56d11ea98be1a22caca0d85040ab3fc375216f
2021-04-09 10:14:13 -04:00
Rubin Xu
f5d0b425d4 Recognize numeric PIN in resetPasswordWithToken()
If the new password is numeric only, treat it as numeric
PIN when setting it as new lockscreen password.

Bug: 172054475
Bug: 181489206
Test: atest FrameworksServicesTests:DevicePolicyManagerTest
Change-Id: Ie15f1966a76344d3bb8e8778599fbd604bfa8c69
2021-04-09 13:39:27 +01:00
Eran Messeri
a23111e74c Rename Enterprise Network Preference to Preferential network service
Rename the logging constant for the "Enterprise Network Preference" to
"Preferential Network Service".

Bug: 183663019
Test: atest FrameworksServicesTests:DevicePolicyManagerTest android.admin.cts.DevicePolicyManagerTest#testSetGetPreferentialNetworkServiceEnabled  com.android.cts.devicepolicy.MixedManagedProfileOwnerTest#testSetGetPreferentialNetworkServiceStatus com.android.cts.devicepolicy.MixedManagedProfileOwnerTest#testSetPreferentialNetworkServiceStatusLogged
Change-Id: I24508b42b3820091760c372d18a9f6157cd53d50
2021-04-09 12:39:21 +01:00
Charles Chen
8926087107 Merge "Allow config context to inflate views" into sc-dev am: c22aff4e4d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13482649

Change-Id: Idc103720792c36b1a1e3331a5d2bea72e87e8efa
2021-04-09 07:17:18 +00:00