DOs can clear the DI; rehide hasUserSetupCompleted.

Bug: 19230954
Change-Id: I97467229b23f3c9be1c3c4fff1c888a812f14a95

1 files changed, 3 insertions, 11 deletions

diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
index 6270212..7e7eb2d 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -3947,18 +3947,10 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
         if (packageName == null) {
             throw new NullPointerException("packageName is null");
         }
-        try {
-            int uid = mContext.getPackageManager().getPackageUid(packageName, 0);
-            if (uid != Binder.getCallingUid()) {
-                throw new SecurityException(
-                        "clearDeviceInitializer can only be called by the device initializer");
-            }
-        } catch (NameNotFoundException e) {
-            throw new SecurityException(e);
-        }
-        if (!isDeviceInitializer(packageName)) {
+
+        if (!isDeviceInitializer(packageName) && !isDeviceOwner(packageName)) {
             throw new SecurityException(
-                    "clearDeviceInitializer can only be called by the device initializer");
+                    "clearDeviceInitializer can only be called by the device initializer/owner");
         }
         synchronized (this) {
             long ident = Binder.clearCallingIdentity();