Commit Graph

20685 Commits

Author SHA1 Message Date
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
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
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
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
Charles Chen
c22aff4e4d Merge "Allow config context to inflate views" into sc-dev 2021-04-09 06:56:16 +00:00
Jeff Sharkey
2e58634383 Merge "New BLUETOOTH_ADVERTISE manifest permission." into sc-dev am: 7627719334
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14065920

Change-Id: I60b159d8ebf1e72a4b92769845a659d3dc24c4ae
2021-04-09 05:37:30 +00:00
Jeff Sharkey
7627719334 Merge "New BLUETOOTH_ADVERTISE manifest permission." into sc-dev 2021-04-09 05:22:23 +00:00
Jeff Sharkey
6dcac06a84 New BLUETOOTH_ADVERTISE manifest permission.
This change is part of defining a distinct BLUETOOTH_ADVERTISE
permission to guard the BluetoothLeAdvertiser APIs, since that's a
distinct enough of an operation from SCAN and CONNECT.  It'll
continue to be covered under the general "Nearby devices" runtime
permission group.

Bug: 181813006
Test: atest CtsPermission2TestCases
Test: atest CtsPermission3TestCases
Change-Id: I8b62e4d625df1e201f12a73025cd29c431feea79
2021-04-08 20:15:02 -06:00
Steven Moreland
c04fc646bf Merge "reflect libbinder/am split" into sc-dev am: 544010a9b2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14128938

Change-Id: Ia64a2e7b45fc66f39b8b49b4a62c15cc8435d51b
2021-04-09 00:59:53 +00:00
Steven Moreland
8e6aa6679e reflect libbinder/am split
(manual cherry-pick from AOSP to fix merge conflict)

Minimizing cost for using libbinder.

Bug: 183654927
Test: boot
Change-Id: I1a4785a58afcaf2d312ef52a07f41fe3dd3a8fa6
2021-04-08 23:56:27 +00:00
Ruslan Tkhakokhov
f50a1019f2 Merge "[FSD2D] Remove left-over code from proof-of-concept" into sc-dev am: a10dc432ae
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14116768

Change-Id: If81b4e426c30cde3c27af8ac7496c790347d8f16
2021-04-08 20:47:08 +00:00
Ruslan Tkhakokhov
a10dc432ae Merge "[FSD2D] Remove left-over code from proof-of-concept" into sc-dev 2021-04-08 20:41:54 +00:00
Felipe Leme
ef5d119cd7 Documents that wipeData() is allowed for apps with MASTER_CLEAR permission.
Test: none
Bug: 169779216

Change-Id: Ic1e95efe77ca5289db6993caaffd590fcc1210cd
2021-04-08 13:25:49 -07:00
Mady Mellor
4da856e1ef API feedback: setSuppressableBubble/setSuppressBubble
Apps can't actually suppress the bubble, that is only
done by the system so that method is @hide.

Did a similar thing for setSuppressNotification for
consistency.

Test: atest NotificationManagerTest (see CTS CL)
Bug: 184204395
Change-Id: Ia17453507daf5bba4408bd6b386efa225c3051dd
2021-04-08 19:26:14 +00:00
Mady Mellor
ad365cd45c Merge "API feedback: make bubble pref an int def" into sc-dev am: a7e6b9481b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14114088

Change-Id: I51ee454a46d581afd505ea32119373468176eac6
2021-04-08 19:22:31 +00:00
Mady Mellor
a7e6b9481b Merge "API feedback: make bubble pref an int def" into sc-dev 2021-04-08 19:12:53 +00:00
Svetoslav Ganov
9af27f7e25 Merge "Activity recognition source app op tracking" into sc-dev am: 64b26b5c49
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14083130

Change-Id: Iedefa5b30107d993f08a86f677f3e6e2b20849dd
2021-04-08 18:39:17 +00:00
Svetoslav Ganov
64b26b5c49 Merge "Activity recognition source app op tracking" into sc-dev 2021-04-08 18:34:58 +00:00
Ruslan Tkhakokhov
cd425e62c6 [FSD2D] Remove left-over code from proof-of-concept
This code was not meant to be shipped and was disabled by default. It
was accidentally enabled when productionizing the final version of FSD2D.

Bug: 184781934
Test: 1. atest CtsBackupTestCases
      2. atest CtsBackupHostTestCases
      3. Run a D2D transfer and verify system apps are properly restored
Change-Id: I47dbc769a316b17a38b6c21d7a1294d7ff977491
2021-04-08 17:35:50 +00:00
Alex Johnston
8dd5021359 PasswordPolicy.getMinMetrics PIN
* If the password quality is NUMERIC
  or NUMERIC_COMPLEX, the credential
  type should be CREDENTIAL_TYPE_PIN

Bug: 184103377
Test: atest com.android.server.devicepolicy.PasswordPolicyTest
      make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.password
      CtsVerifier > Device owner tests > policy transparency test
      > set password quality
Change-Id: If0b1fbc71bbd0b4e59bc05594cd14e99a32d8bd1
2021-04-08 15:51:22 +00:00
Neil Fuller
6d1c1ef0bd Merge "Adjust geotz feature config logic" into sc-dev am: 3556ad854b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14104667

Change-Id: I9e211859f9bd02b8b9ccd9b6690534570aadc1e1
2021-04-08 13:42:45 +00:00
Neil Fuller
3556ad854b Merge "Adjust geotz feature config logic" into sc-dev 2021-04-08 13:28:50 +00:00
Kholoud Mohamed
77488ded3f Merge "Add set/verify lock credentials testAPIs in KeygyardManager" into sc-dev am: 45dc22e11c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13929331

Change-Id: I1834dd888c22571a1b78242ab3cd39333abb5674
2021-04-08 00:52:27 +00:00
Kholoud Mohamed
45dc22e11c Merge "Add set/verify lock credentials testAPIs in KeygyardManager" into sc-dev 2021-04-08 00:38:36 +00:00
Sudheer Shanka
d7fa21b4b6 Merge "Allow clients to register for listening to changes in capabilities." into sc-dev am: 9576b5a2be
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14019846

Change-Id: I8c4a015da7b17cb8679cb1d63add5028f24c2463
2021-04-07 20:28:58 +00:00
Sudheer Shanka
9576b5a2be Merge "Allow clients to register for listening to changes in capabilities." into sc-dev 2021-04-07 20:18:04 +00:00
Makoto Onuki
834e22dd97 Merge "Use descriptive exception for FGS start timeout" into sc-dev am: 779f120a91
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14069292

Change-Id: I58cac05197fe775bbefc0244e50e7316f0368f06
2021-04-07 18:42:27 +00:00
Eran Messeri
1663624e5d Address API review for admin-granted permissions
Address API review for changes related to admin-granted permissions:
* Change the provisioning extra to indicate it only affects
  sensors-related permissions.
* Add an IntDef for the AdminPermissionControlParams grant state.

Bug: 184204476
Bug: 184204334
Test: atest ManagedProvisioningTests
Change-Id: I75c8b6de1e897e02916b17f0ae3a521f8384c242
2021-04-07 19:03:44 +01:00
Mady Mellor
813fc2af2c API feedback: make bubble pref an int def
Test: TH
Bug: 184204590
Change-Id: Ie8b138e8686dc8be89dbb9ef0698552040e89c8d
2021-04-07 10:34:46 -07:00