Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Expose some testAPIs in DPM" into sc-dev

Browse Source
This commit is contained in:
Kholoud Mohamed
2021-03-02 10:03:14 +00:00
committed by Android (Google) Code Review
parent 05955bd175 5384e86d41
commit dcbd16339d
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/api/test-current.txt
View File

@@ -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.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 @RequiresPermission(android.Manifest.permission.FORCE_DEVICE_POLICY_MANAGER_LOGS) public long forceSecurityLogs();
method public void forceUpdateUserSetupComplete(); 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 getLastBugReportRequestTime();
method public long getLastNetworkLogRetrievalTime(); method public long getLastNetworkLogRetrievalTime();
method public long getLastSecurityLogRetrievalTime(); method public long getLastSecurityLogRetrievalTime();

6
core/java/android/app/admin/DevicePolicyManager.java
View File

@@ -12239,8 +12239,9 @@ public class DevicePolicyManager {
* *
* @hide * @hide
*/ */
public Set<String> getDisallowedSystemApps(ComponentName admin, int userId, @TestApi
String provisioningAction) { public @NonNull Set<String> getDisallowedSystemApps(@NonNull ComponentName admin,
@UserIdInt int userId, @NonNull String provisioningAction) {
try { try {
return new ArraySet<>( return new ArraySet<>(
mService.getDisallowedSystemApps(admin, userId, provisioningAction)); mService.getDisallowedSystemApps(admin, userId, provisioningAction));
@@ -13004,6 +13005,7 @@ public class DevicePolicyManager {
* *
* @hide * @hide
*/ */
@TestApi
public @NonNull Set<String> getDefaultCrossProfilePackages() { public @NonNull Set<String> getDefaultCrossProfilePackages() {
throwIfParentInstance("getDefaultCrossProfilePackages"); throwIfParentInstance("getDefaultCrossProfilePackages");
if (mService != null) { if (mService != null) {