Enable the first account ready receiver in onProfileProvisioningComplete

Change-Id: I08da80359d4b37d4ea42170cec77b36c4cf010bf
Fix: 29232240

Author: tony-mak

app/src/main/java/com/afwsamples/testdpc/AddAccountActivity.java

@@ -23,8 +23,6 @@
 import android.accounts.OperationCanceledException;
 import android.app.Activity;
 import android.app.AlertDialog;
-import android.app.admin.DevicePolicyManager;
-import android.content.ComponentName;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
@@ -34,8 +32,6 @@
 import android.widget.EditText;
 import android.widget.RadioGroup;
 
-import com.afwsamples.testdpc.common.LaunchIntentUtil;
-import com.afwsamples.testdpc.common.Util;
 import com.android.setupwizardlib.SetupWizardLayout;
 import com.android.setupwizardlib.view.NavigationBar;
 
@@ -74,15 +70,6 @@ protected void onCreate(Bundle savedInstanceState) {
     }
 
     private void addAccount(String accountName) {
-        // Enable first account ready receiver for PO flow. On pre-N devices, the only supported
-        // PO flow is managed profile. On N+ devices we need to check whether we're running in a
-        // managed profile.
-        DevicePolicyManager dpm = (DevicePolicyManager) getSystemService(DEVICE_POLICY_SERVICE);
-        ComponentName adminComponent = DeviceAdminReceiver.getComponentName(this);
-        if (dpm.isProfileOwnerApp(getPackageName())
-                && (Util.isBeforeN() || Util.isManagedProfile(this, adminComponent))) {
-            FirstAccountReadyBroadcastReceiver.setEnabled(this, true);
-        }
         AccountManager accountManager = AccountManager.get(this);
         Bundle bundle = new Bundle();
         if (!TextUtils.isEmpty(accountName)) {

app/src/main/java/com/afwsamples/testdpc/DeviceAdminReceiver.java

@@ -133,6 +133,15 @@ public void onProfileProvisioningComplete(Context context, Intent intent) {
             }
         }
 
+        // Enable first account ready receiver for PO flow. On pre-N devices, the only supported
+        // PO flow is managed profile. On N+ devices we need to check whether we're running in a
+        // managed profile.
+        ComponentName adminComponent = DeviceAdminReceiver.getComponentName(context);
+        if (devicePolicyManager.isProfileOwnerApp(context.getPackageName())
+                && (Util.isBeforeN() || Util.isManagedProfile(context, adminComponent))) {
+            FirstAccountReadyBroadcastReceiver.setEnabled(context, true);
+        }
+
         // For synchronous auth cases, we can assume accounts are already setup (or will be shortly,
         // as account migration for Profile Owner is asynchronous). For COSU we don't want to show
         // the account option to the user, as no accounts should be added for now.

app/src/main/java/com/afwsamples/testdpc/EnableProfileActivity.java

@@ -69,7 +69,7 @@ protected void onCreate(Bundle savedInstanceState) {
             if (mEnableProfileNow) {
                 ProvisioningUtil.enableProfile(this);
             } else {
-                // Set up an alarm to enable profile in case we do not receive first account
+                // Set up an alarm to enable profile in case we do not receive first account ready
                 // broadcast for whatever reason.
                 FirstAccountReadyBroadcastReceiver.scheduleFirstAccountReadyTimeoutAlarm(
                         this, WAIT_FOR_FIRST_ACCOUNT_READY_TIMEOUT);