Merge "Remove COMP option and send added account info to managed profile TestDPC." into ub-testdpc-qt

Author: Yueming Wang

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

@@ -16,6 +16,9 @@
 
 package com.afwsamples.testdpc;
 
+import static android.app.admin.DevicePolicyManager.EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE;
+import static android.app.admin.DevicePolicyManager.EXTRA_PROVISIONING_DEVICE_ADMIN_COMPONENT_NAME;
+
 import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.app.Activity;
@@ -67,7 +70,7 @@ protected void onCreate(Bundle savedInstanceState) {
         }
 
         // Show the user which account now has management, if specified.
-        String addedAccount = getIntent().getStringExtra(LaunchIntentUtil.EXTRA_ACCOUNT_NAME);
+        final String addedAccount = getAddedAccountName();
         if (addedAccount != null) {
             View accountMigrationStatusLayout;
             if (isAccountMigrated(addedAccount)) {
@@ -86,6 +89,17 @@ protected void onCreate(Bundle savedInstanceState) {
                 : R.string.all_done_explanation_profile_owner);
     }
 
+    private String getAddedAccountName() {
+        String addedAccount = getIntent().getStringExtra(LaunchIntentUtil.EXTRA_ACCOUNT_NAME);
+        // Added account infomation may be contained in EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE
+        // if FinalizeActivity is started from ACTION_ADMIN_POLICY_COMPLIANCE.
+        if (addedAccount == null) {
+            addedAccount = LaunchIntentUtil.getAddedAccountName(
+                getIntent().getParcelableExtra(EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE));
+        }
+        return addedAccount;
+    }
+
     private boolean isAccountMigrated(String addedAccount) {
         Account[] accounts = AccountManager.get(this).getAccounts();
         for (Account account : accounts) {

app/src/main/java/com/afwsamples/testdpc/provision/DpcLoginActivity.java

@@ -17,16 +17,19 @@
 package com.afwsamples.testdpc.provision;
 
 import static android.app.admin.DevicePolicyManager.EXTRA_PROVISIONING_ACCOUNT_TO_MIGRATE;
+import static android.app.admin.DevicePolicyManager.EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE;
 
 import android.accounts.Account;
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
+import android.os.PersistableBundle;
 import android.util.Log;
 import android.view.View;
 import android.widget.RadioGroup;
 import com.afwsamples.testdpc.AddAccountActivity;
 import com.afwsamples.testdpc.R;
+import com.afwsamples.testdpc.common.LaunchIntentUtil;
 import com.android.setupwizardlib.GlifLayout;
 
 /**
@@ -78,6 +81,9 @@ private Intent createResultIntentFromData(Intent data) {
             final Account accountToMigrate = data.getParcelableExtra(
                 EXTRA_PROVISIONING_ACCOUNT_TO_MIGRATE);
             resultIntent.putExtra(EXTRA_PROVISIONING_ACCOUNT_TO_MIGRATE, accountToMigrate);
+            final PersistableBundle bundle = new PersistableBundle();
+            bundle.putString(LaunchIntentUtil.EXTRA_ACCOUNT_NAME, accountToMigrate.name);
+            resultIntent.putExtra(EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE, bundle);
         }
         return resultIntent;
     }
@@ -95,11 +101,6 @@ private void onNavigateNext(View nextButton) {
                     new Intent(getApplicationContext(), AddAccountActivity.class),
                     ADD_ACCOUNT_REQUEST_CODE);
                 return;
-            case R.id.dpc_login_comp:
-                intent.putExtra(EXTRA_PROVISIONING_MODE,
-                    PROVISIONING_MODE_MANAGED_PROFILE_ON_FULLY_MANAGED_DEVICE);
-                finishWithIntent(intent);
-                return;
             default:
                 finish();
         }

app/src/main/res/layout/activity_dpc_login.xml

@@ -55,12 +55,6 @@
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
           android:text="@string/dpc_login_po" />
-
-      <RadioButton
-          android:id="@+id/dpc_login_comp"
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:text="@string/dpc_login_comp" />
     </RadioGroup>
   </LinearLayout>