commit 29d6c23ee08ac51a7ffa33d264d09cbcf8bcc723
author Amith Yamasani <yamasani@google.com> Mon Jul 28 16:42:45 2014 -0700
committer Amith Yamasani <yamasani@google.com> Tue Jul 29 13:50:34 2014 -0700
tree 68f184a11dbfa7a9a2d9d6096850c12db0345610
parent 920418bf8b43451463e089b21eeb0d198c8ebb7c

Follow change to DPM.setProfileOwner API

Pass in the component name, not just the package name,
since some packages might have both admins and profile owners.
It should be possible to identify which one is a profile owner
and deactivate an admin in that package that's not a profile owner.

Side effect of Bug: 16207721

Change-Id: Id45038e7a2e676fa0ed86aa4901ad8f2e407227e

src/com/android/managedprovisioning/ManagedProvisioningService.java

diff --git a/src/com/android/managedprovisioning/ManagedProvisioningService.java b/src/com/android/managedprovisioning/ManagedProvisioningService.java
index b6d3bb9..6e2b62f 100644
--- a/src/com/android/managedprovisioning/ManagedProvisioningService.java
+++ b/src/com/android/managedprovisioning/ManagedProvisioningService.java
@@ -265,8 +265,8 @@
 
         DevicePolicyManager dpm =
                 (DevicePolicyManager) getSystemService(Context.DEVICE_POLICY_SERVICE);
-        if (!dpm.setProfileOwner(
-                mMdmPackageName, mDefaultManagedProfileName, mManagedProfileUserInfo.id)) {
+        if (!dpm.setProfileOwner(mActiveAdminComponentName,
+                mDefaultManagedProfileName, mManagedProfileUserInfo.id)) {
             ProvisionLogger.logw("Could not set profile owner.");
             error("Could not set profile owner.");
         }