commit ba253393e1ab941f927831d2e6e9a2c61e8ebf54
author Julia Reynolds <juliacr@google.com> Mon Mar 23 15:03:12 2015 -0400
committer Julia Reynolds <juliacr@google.com> Tue Mar 24 11:11:42 2015 -0400
tree 71e2bd64b2e394110d6841340042f7cb4f17ccc2
parent d0f2928a28d38ce8344b7f15fbfec97aebec0db6

Disable the initializer & remove as active admin when provisioning completes.

Bug: 19894752
Change-Id: Ia20f192033ac9d4c9190ed372bce0f70de9e893e

src/com/android/managedprovisioning/HomeReceiverActivity.java

diff --git a/src/com/android/managedprovisioning/HomeReceiverActivity.java b/src/com/android/managedprovisioning/HomeReceiverActivity.java
index 0664512..0dd54b1 100644
--- a/src/com/android/managedprovisioning/HomeReceiverActivity.java
+++ b/src/com/android/managedprovisioning/HomeReceiverActivity.java
@@ -20,6 +20,7 @@
 import static android.app.admin.DevicePolicyManager.EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE;
 
 import android.app.Activity;
+import android.app.admin.DevicePolicyManager;
 import android.content.ComponentName;
 import android.content.Intent;
 import android.content.pm.PackageManager;
@@ -46,10 +47,7 @@
         } finally {
             // Disable the HomeReceiverActivity. Make sure this is always called to prevent an
             // infinite loop of HomeReceiverActivity capturing HOME intent in case something fails.
-            PackageManager pm = getPackageManager();
-            pm.setComponentEnabledSetting(new ComponentName(this,
-                            HomeReceiverActivity.class), PackageManager
-                    .COMPONENT_ENABLED_STATE_DISABLED, PackageManager.DONT_KILL_APP);
+            disableComponent(new ComponentName(this, HomeReceiverActivity.class));
         }
         finish();
     }
@@ -71,6 +69,14 @@
             return;
         }
 
+        // Disable the Device Initializer component, if it exists, in case it did not do so itself.
+        if(mParams.mDeviceInitializerComponentName != null) {
+            DevicePolicyManager devicePolicyManager =
+                    (DevicePolicyManager) getSystemService(DEVICE_POLICY_SERVICE);
+            devicePolicyManager.removeActiveAdmin(mParams.mDeviceInitializerComponentName);
+            disableComponent(mParams.mDeviceInitializerComponentName);
+        }
+
         // Finalizing provisioning: send complete intent to mdm.
         Intent result = new Intent(ACTION_PROFILE_PROVISIONING_COMPLETE);
         try {
@@ -87,4 +93,11 @@
         }
         sendBroadcast(result);
     }
+
+    private void disableComponent(ComponentName component) {
+        PackageManager pm = getPackageManager();
+        pm.setComponentEnabledSetting(component,
+                PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
+                PackageManager.DONT_KILL_APP);
+    }
 }