diff options
| author | 2021-03-02 10:03:14 +0000 | |
|---|---|---|
| committer | 2021-03-02 10:03:14 +0000 | |
| commit | dcbd16339df74edeadbdfe10e1f89c9e45b40828 (patch) | |
| tree | 08b9d88c4e7dad7aa39fe8809da2e1a813acc345 | |
| parent | 05955bd175ddcad1e67ad7be0192c860180e1c8d (diff) | |
| parent | 5384e86d41cb46bc377c85c82b84ef591938aab1 (diff) | |
Merge "Expose some testAPIs in DPM" into sc-dev
| -rw-r--r-- | core/api/test-current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/app/admin/DevicePolicyManager.java | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/core/api/test-current.txt b/core/api/test-current.txt index 76295545ad17..1e5a6f12f96b 100644 --- a/core/api/test-current.txt +++ b/core/api/test-current.txt @@ -399,6 +399,8 @@ package android.app.admin { method @RequiresPermission("android.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS") public void forceRemoveActiveAdmin(@NonNull android.content.ComponentName, int); method @RequiresPermission(android.Manifest.permission.FORCE_DEVICE_POLICY_MANAGER_LOGS) public long forceSecurityLogs(); method public void forceUpdateUserSetupComplete(); + method @NonNull public java.util.Set<java.lang.String> getDefaultCrossProfilePackages(); + method @NonNull public java.util.Set<java.lang.String> getDisallowedSystemApps(@NonNull android.content.ComponentName, int, @NonNull String); method public long getLastBugReportRequestTime(); method public long getLastNetworkLogRetrievalTime(); method public long getLastSecurityLogRetrievalTime(); diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index bb1ff6051d56..b919bfc92e79 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -12239,8 +12239,9 @@ public class DevicePolicyManager { * * @hide */ - public Set<String> getDisallowedSystemApps(ComponentName admin, int userId, - String provisioningAction) { + @TestApi + public @NonNull Set<String> getDisallowedSystemApps(@NonNull ComponentName admin, + @UserIdInt int userId, @NonNull String provisioningAction) { try { return new ArraySet<>( mService.getDisallowedSystemApps(admin, userId, provisioningAction)); @@ -13004,6 +13005,7 @@ public class DevicePolicyManager { * * @hide */ + @TestApi public @NonNull Set<String> getDefaultCrossProfilePackages() { throwIfParentInstance("getDefaultCrossProfilePackages"); if (mService != null) { |