Revert "Add UI for testing forced re-enrollment."

This reverts commit fe471ff4db4339ceb2b492a7cab9268cbbb0b09e.

Reason for revert: Forced re-enrollment (FRE) is deprecated and support
has been removed from GmsCore. Cleaning up related code in TestDpc.

Change-Id: I60e1e0ce1ebc7ef18e75a2bd40871b94e4d09d9c

Author: bernardchau

app/src/main/java/com/afwsamples/testdpc/common/Util.java

@@ -30,7 +30,6 @@
 import android.net.Uri;
 import android.os.Build.VERSION;
 import android.os.Build.VERSION_CODES;
-import android.os.Bundle;
 import android.os.UserHandle;
 import android.os.UserManager;
 import androidx.preference.PreferenceFragment;
@@ -54,11 +53,6 @@ public class Util {
     private static final String TAG = "Util";
     private static final int DEFAULT_BUFFER_SIZE = 4096;
 
-    private static final String BROADCAST_ACTION_FRP_CONFIG_CHANGED =
-        "com.google.android.gms.auth.FRP_CONFIG_CHANGED";
-    private static final String GMSCORE_PACKAGE = "com.google.android.gms";
-    private static final String PERSISTENT_DEVICE_OWNER_STATE = "persistentDeviceOwnerState";
-
     // TODO: Update to S when VERSION_CODES.R becomes available.
     public static final int R_VERSION_CODE = 30;
 
@@ -205,42 +199,6 @@ public static boolean installCaCertificate(InputStream certificateInputStream,
         return false;
     }
 
-    /**
-     * Returns the persistent device owner state which has been set by the device owner as an app
-     * restriction on GmsCore or null if there is no such restriction set.
-     */
-    @TargetApi(VERSION_CODES.O)
-    public static String getPersistentDoStateFromApplicationRestriction(
-            DevicePolicyManager dpm, ComponentName admin) {
-        Bundle restrictions = dpm.getApplicationRestrictions(admin, GMSCORE_PACKAGE);
-        return restrictions.getString(PERSISTENT_DEVICE_OWNER_STATE);
-    }
-
-    /**
-     * Sets the persistent device owner state by setting a special app restriction on GmsCore and
-     * notifies GmsCore about the change by sending a broadcast.
-     *
-     * @param state The device owner state to be preserved across factory resets. If null, the
-     * persistent device owner state and the corresponding restiction are cleared.
-     */
-    @TargetApi(VERSION_CODES.O)
-    public static void setPersistentDoStateWithApplicationRestriction(
-            Context context, DevicePolicyManager dpm, ComponentName admin, String state) {
-        Bundle restrictions = dpm.getApplicationRestrictions(admin, GMSCORE_PACKAGE);
-        if (state == null) {
-            // Clear the restriction
-            restrictions.remove(PERSISTENT_DEVICE_OWNER_STATE);
-        } else {
-            // Set the restriction
-            restrictions.putString(PERSISTENT_DEVICE_OWNER_STATE, state);
-        }
-        dpm.setApplicationRestrictions(admin, GMSCORE_PACKAGE, restrictions);
-        Intent broadcastIntent = new Intent(BROADCAST_ACTION_FRP_CONFIG_CHANGED);
-        broadcastIntent.setPackage(GMSCORE_PACKAGE);
-        broadcastIntent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
-        context.sendBroadcast(broadcastIntent);
-    }
-
     /** @return Intent for the default home activity */
     public static Intent getHomeIntent() {
         final Intent intent = new Intent(Intent.ACTION_MAIN);

app/src/main/java/com/afwsamples/testdpc/policy/PersistentDeviceOwnerFragment.java

@@ -371,7 +371,6 @@ public class PolicyManagementFragment extends BaseSearchablePolicyPreferenceFrag
     private static final String CLEAR_APP_DATA_KEY = "clear_app_data";
     private static final String KEEP_UNINSTALLED_PACKAGES = "keep_uninstalled_packages";
     private static final String WIPE_DATA_KEY = "wipe_data";
-    private static final String PERSISTENT_DEVICE_OWNER_KEY = "persistent_device_owner";
     private static final String CREATE_WIFI_CONFIGURATION_KEY = "create_wifi_configuration";
     private static final String CREATE_EAP_TLS_WIFI_CONFIGURATION_KEY
             = "create_eap_tls_wifi_configuration";
@@ -608,7 +607,6 @@ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
                 STAY_ON_WHILE_PLUGGED_IN);
         mStayOnWhilePluggedInSwitchPreference.setOnPreferenceChangeListener(this);
         findPreference(WIPE_DATA_KEY).setOnPreferenceClickListener(this);
-        findPreference(PERSISTENT_DEVICE_OWNER_KEY).setOnPreferenceClickListener(this);
         findPreference(REMOVE_DEVICE_OWNER_KEY).setOnPreferenceClickListener(this);
         mEnableBackupServicePreference = (DpcSwitchPreference) findPreference(
             ENABLE_BACKUP_SERVICE);
@@ -937,9 +935,6 @@ public void onPositiveButtonClicked(String[] lockTaskArray) {
             case WIPE_DATA_KEY:
                 showWipeDataPrompt();
                 return true;
-            case PERSISTENT_DEVICE_OWNER_KEY:
-                showFragment(new PersistentDeviceOwnerFragment());
-                return true;
             case REMOVE_DEVICE_OWNER_KEY:
                 showRemoveDeviceOwnerPrompt();
                 return true;

app/src/main/java/com/afwsamples/testdpc/policy/PolicyManagementFragment.java

@@ -35,7 +35,6 @@
 import android.os.PersistableBundle;
 import android.util.Log;
 import com.afwsamples.testdpc.AddAccountActivity;
-import com.afwsamples.testdpc.DeviceAdminReceiver;
 import com.afwsamples.testdpc.FinalizeActivity;
 import com.afwsamples.testdpc.common.LaunchIntentUtil;
 import com.afwsamples.testdpc.common.Util;
@@ -63,8 +62,6 @@ public class PostProvisioningTask {
             "com.afwsamples.testdpc.SetupManagementLaunchActivity";
     private static final String POST_PROV_PREFS = "post_prov_prefs";
     private static final String KEY_POST_PROV_DONE = "key_post_prov_done";
-    private static final String KEY_DEVICE_OWNER_STATE =
-          "android.app.extra.PERSISTENT_DEVICE_OWNER_STATE";
 
     private final Context mContext;
     private final DevicePolicyManager mDevicePolicyManager;
@@ -97,18 +94,6 @@ public boolean performPostProvisioningOperations(Intent intent) {
             maybeSetAffiliationIds(extras);
         }
 
-        // If TestDPC asked GmsCore to store its state in the FRP area before factory reset, the
-        // state will be handed over to it during the next device setup.
-        if (Util.SDK_INT >= VERSION_CODES.O_MR1
-            && extras != null
-            && extras.containsKey(KEY_DEVICE_OWNER_STATE)) {
-            Util.setPersistentDoStateWithApplicationRestriction(
-                mContext,
-                mDevicePolicyManager,
-                DeviceAdminReceiver.getComponentName(mContext),
-                extras.getString(KEY_DEVICE_OWNER_STATE));
-        }
-
         // Hide the setup launcher when this app is the admin
         mContext.getPackageManager().setComponentEnabledSetting(
                 new ComponentName(mContext, SETUP_MANAGEMENT_LAUNCH_ACTIVITY),

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

@@ -133,17 +133,13 @@
     <string name="wipe_data_title">Wipe data?</string>
     <string name="wipe_data_confirmation">Are you sure you want to wipe the data?</string>
     <string name="wipe_data_include">Also wipe:</string>
-    <string name="persistent_device_owner">Persistent device owner state</string>
     <string name="external_storage">External storage</string>
     <string name="reset_protection_data">Factory reset protection</string>
     <string name="remove_device_owner">Remove this device owner</string>
     <string name="remove_device_owner_title">Remove device owner?</string>
     <string name="remove_device_owner_confirmation">Policies and restrictions will continue to be
         active and may require a factory reset to clear.</string>
     <string name="device_owner_removed">This app is no longer a device owner.</string>
-    <string name="persistent_device_owner_state_hint">Test state to be restored alongside the device owner after factory reset.</string>
-    <string name="set_persistent_device_owner_label">Set</string>
-    <string name="clear_persistent_device_owner_label">Clear</string>
     <!-- Corporate-owned work profile falls under device owner management, for convenience. -->
     <string name="factory_reset_org_owned">Factory reset Org-Owned Work Profile device</string>
     <string name="set_factory_reset_protection_policy">Set factory reset protection policy</string>

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

@@ -743,11 +743,6 @@
             android:title="@string/reboot"
             testdpc:admin="deviceOwner"
             testdpc:minSdkVersion="N" />
-        <com.afwsamples.testdpc.common.preference.DpcPreference
-            android:key="persistent_device_owner"
-            android:title="@string/persistent_device_owner"
-            testdpc:admin="deviceOwner"
-            testdpc:minSdkVersion="O_MR1" />
         <com.afwsamples.testdpc.common.preference.DpcPreference
             android:key="set_factory_reset_protection_policy"
             android:title="@string/set_factory_reset_protection_policy"