diff options
| -rw-r--r-- | core/api/test-current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/app/admin/DevicePolicyManager.java | 23 |
2 files changed, 22 insertions, 2 deletions
diff --git a/core/api/test-current.txt b/core/api/test-current.txt index 2e8bed32665c..c047e481088c 100644 --- a/core/api/test-current.txt +++ b/core/api/test-current.txt @@ -502,6 +502,7 @@ package android.app.admin { method public void forceUpdateUserSetupComplete(int); method @NonNull public java.util.Set<java.lang.String> getDefaultCrossProfilePackages(); method public int getDeviceOwnerType(@NonNull android.content.ComponentName); + method @Nullable public String getDevicePolicyManagementRoleHolderUpdaterPackage(); 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(); diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index 7269b0d91d02..2a98c25d8d7a 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -15737,9 +15737,28 @@ public class DevicePolicyManager { */ @Nullable public String getDevicePolicyManagementRoleHolderPackage() { - String deviceManagerConfig = mContext.getString( + String devicePolicyManagementConfig = mContext.getString( com.android.internal.R.string.config_devicePolicyManagement); - return extractPackageNameFromDeviceManagerConfig(deviceManagerConfig); + return extractPackageNameFromDeviceManagerConfig(devicePolicyManagementConfig); + } + + /** + * Returns the package name of the device policy management role holder updater. + * + * <p>If the device policy management role holder updater is not configured for this device, + * returns {@code null}. + * + * @hide + */ + @Nullable + @TestApi + public String getDevicePolicyManagementRoleHolderUpdaterPackage() { + String devicePolicyManagementUpdaterConfig = mContext.getString( + com.android.internal.R.string.config_devicePolicyManagementUpdater); + if (TextUtils.isEmpty(devicePolicyManagementUpdaterConfig)) { + return null; + } + return devicePolicyManagementUpdaterConfig; } /** |