DOs can clear the DI; rehide hasUserSetupCompleted.
Bug: 19230954
Change-Id: I97467229b23f3c9be1c3c4fff1c888a812f14a95
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java
index cee8e8d..add7130 100644
--- a/core/java/android/app/admin/DevicePolicyManager.java
+++ b/core/java/android/app/admin/DevicePolicyManager.java
@@ -2474,10 +2474,9 @@
}
/**
- * Clears the current device initializer. The caller must be the device initializer.
- *
- * This function should be used cautiously as once it is called it cannot
- * be undone.
+ * Removes the device initializer, so that it will not be invoked on user initialization for any
+ * subsequently created users. This method can be called by either the device owner or device
+ * initializer itself.
*/
public void clearDeviceInitializerApp() {
if (mService != null) {
@@ -2586,6 +2585,7 @@
}
/**
+ * @hide
* Checks if the user was already setup.
*/
public boolean hasUserSetupCompleted() {