diff --git a/core/api/test-current.txt b/core/api/test-current.txt index d984abe457c9d..436fbe6395f16 100644 --- a/core/api/test-current.txt +++ b/core/api/test-current.txt @@ -501,6 +501,7 @@ package android.app.admin { method public void forceUpdateUserSetupComplete(int); method @NonNull public java.util.Set getDefaultCrossProfilePackages(); method public int getDeviceOwnerType(@NonNull android.content.ComponentName); + method @Nullable public String getDevicePolicyManagementRoleHolderUpdaterPackage(); method @NonNull public java.util.Set 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 10e976f79b398..af381676aa67f 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -15772,9 +15772,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. + * + *

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; } /**