diff --git a/api/system-current.txt b/api/system-current.txt index da1517636fc80..f0dab7345e0b1 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -6280,6 +6280,8 @@ package android.app.admin { method public boolean isCallerApplicationRestrictionsManagingPackage(); method public boolean isDeviceManaged(); method public boolean isDeviceOwnerApp(java.lang.String); + method public boolean isDeviceProvisioned(); + method public boolean isDeviceProvisioningConfigApplied(); method public boolean isLockTaskPermitted(java.lang.String); method public boolean isManagedProfile(android.content.ComponentName); method public boolean isMasterVolumeMuted(android.content.ComponentName); @@ -6315,6 +6317,7 @@ package android.app.admin { method public void setCrossProfileCallerIdDisabled(android.content.ComponentName, boolean); method public void setCrossProfileContactsSearchDisabled(android.content.ComponentName, boolean); method public void setDeviceOwnerLockScreenInfo(android.content.ComponentName, java.lang.CharSequence); + method public void setDeviceProvisioningConfigApplied(); method public void setGlobalSetting(android.content.ComponentName, java.lang.String, java.lang.String); method public boolean setKeyguardDisabled(android.content.ComponentName, boolean); method public void setKeyguardDisabledFeatures(android.content.ComponentName, int); diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index 39f415e6ad8f0..07030d99a91b9 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -6827,10 +6827,13 @@ public class DevicePolicyManager { } /** + * Returns whether the device has been provisioned. + * + *
Not for use by third-party applications. + * * @hide - * @return whether {@link android.provider.Settings.Global#DEVICE_PROVISIONED} has ever been set - * to 1. */ + @SystemApi public boolean isDeviceProvisioned() { try { return mService.isDeviceProvisioned(); @@ -6840,9 +6843,16 @@ public class DevicePolicyManager { } /** - * @hide - * Writes that the provisioning configuration has been applied. - */ + * Writes that the provisioning configuration has been applied. + * + *
The caller must hold the {@link android.Manifest.permission#MANAGE_USERS} + * permission. + * + *
Not for use by third-party applications. + * + * @hide + */ + @SystemApi public void setDeviceProvisioningConfigApplied() { try { mService.setDeviceProvisioningConfigApplied(); @@ -6852,9 +6862,17 @@ public class DevicePolicyManager { } /** - * @hide + * Returns whether the provisioning configuration has been applied. + * + *
The caller must hold the {@link android.Manifest.permission#MANAGE_USERS} permission. + * + *
Not for use by third-party applications. + * * @return whether the provisioning configuration has been applied. + * + * @hide */ + @SystemApi public boolean isDeviceProvisioningConfigApplied() { try { return mService.isDeviceProvisioningConfigApplied();