Fix permitted keyboard does not persist in TestDPC

The reason is because initIsComponentEnabledList is run before
mPermittedPackageNames is set.

Change initIsComponentEnabledList to setIsComponentEnabledList,
and subclass calls setIsComponentEnabledList when the list is ready.

Bug: 26556732
Change-Id: I19d7ae0b0117f8a5f9e29ac4a4b2a862f8f0c85a

Author: tony-mak

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

@@ -35,6 +35,7 @@
 import com.afwsamples.testdpc.R;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -47,14 +48,15 @@ public abstract class ToggleComponentsArrayAdapter extends ArrayAdapter<ResolveI
 
     protected PackageManager mPackageManager;
     protected DevicePolicyManager mDevicePolicyManager;
-    protected ArrayList<Boolean> mIsComponentCheckedList = new ArrayList<Boolean>();
+    protected List<Boolean> mIsComponentCheckedList;
 
     public ToggleComponentsArrayAdapter(Context context, int resource, List<ResolveInfo> objects) {
         super(context, resource, objects);
         mPackageManager = context.getPackageManager();
         mDevicePolicyManager = (DevicePolicyManager) context.getSystemService(
                 Context.DEVICE_POLICY_SERVICE);
-        initIsComponentEnabledList();
+        // Init mIsComponentCheckedList
+        mIsComponentCheckedList = new ArrayList<>(Arrays.asList(new Boolean[objects.size()]));
     }
 
     /**
@@ -127,9 +129,11 @@ public void onItemClick(AdapterView<?> parent, View view, int position, long id)
     protected abstract ApplicationInfo getApplicationInfo(int position);
 
     /**
-     * Initializes the {@link ToggleComponentsArrayAdapter#mIsComponentCheckedList}.
+     * Update {@link ToggleComponentsArrayAdapter#mIsComponentCheckedList}.
      */
-    protected abstract void initIsComponentEnabledList();
+    protected void setIsComponentEnabledList(List<Boolean> isComponentEnabledList) {
+        mIsComponentCheckedList = isComponentEnabledList;
+    }
 
     /**
      * Checks whether an activity or service is enabled.

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

@@ -40,6 +40,7 @@ public AvailableComponentsInfoArrayAdapter(Context context,
             List<ResolveInfo> resolveInfoList, List<String> permittedPackageNames) {
         super(context, R.id.pkg_name, resolveInfoList);
         mPermittedPackageNames = permittedPackageNames;
+        setIsComponentEnabledList(createIsComponentEnabledList());
     }
 
     /**
@@ -96,12 +97,13 @@ protected Drawable getApplicationIcon(ApplicationInfo applicationInfo) {
         }
     }
 
-    @Override
-    protected void initIsComponentEnabledList() {
+    private List<Boolean> createIsComponentEnabledList() {
+        List<Boolean> isComponentEnabledList = new ArrayList<>();
         int size = getCount();
         for (int i = 0; i < size; i++) {
-            mIsComponentCheckedList.add(isComponentEnabled(getItem(i)));
+            isComponentEnabledList.add(isComponentEnabled(getItem(i)));
         }
+        return isComponentEnabledList;
     }
 
     @Override

app/src/main/java/com/afwsamples/testdpc/policy/blockuninstallation/BlockUninstallationInfoArrayAdapter.java

@@ -28,6 +28,7 @@
 import com.afwsamples.testdpc.R;
 import com.afwsamples.testdpc.common.ToggleComponentsArrayAdapter;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -38,6 +39,7 @@ public class BlockUninstallationInfoArrayAdapter extends ToggleComponentsArrayAd
     public BlockUninstallationInfoArrayAdapter(Context context, int resource,
             List<ResolveInfo> resolveInfoList) {
         super(context, resource, resolveInfoList);
+        setIsComponentEnabledList(createIsComponentEnabledList());
     }
 
     @Override
@@ -76,12 +78,13 @@ protected ApplicationInfo getApplicationInfo(int position) {
         return null;
     }
 
-    @Override
-    protected void initIsComponentEnabledList() {
+    private List<Boolean> createIsComponentEnabledList() {
+        List<Boolean> isComponentEnabledList = new ArrayList<>();
         int size = getCount();
         for (int i = 0; i < size; i++) {
-            mIsComponentCheckedList.add(isComponentEnabled(getItem(i)));
+            isComponentEnabledList.add(isComponentEnabled(getItem(i)));
         }
+        return isComponentEnabledList;
     }
 
     @Override

app/src/main/java/com/afwsamples/testdpc/policy/locktask/LockTaskAppInfoArrayAdapter.java

@@ -35,6 +35,7 @@ public class LockTaskAppInfoArrayAdapter extends ToggleComponentsArrayAdapter {
 
     public LockTaskAppInfoArrayAdapter(Context context, int resource, List<ResolveInfo> objects) {
         super(context, resource, objects);
+        setIsComponentEnabledList(createIsComponentEnabledList());
     }
 
     @Override
@@ -66,12 +67,13 @@ protected ApplicationInfo getApplicationInfo(int position) {
         return getItem(position).activityInfo.applicationInfo;
     }
 
-    @Override
-    protected void initIsComponentEnabledList() {
+    private List<Boolean> createIsComponentEnabledList() {
+        List<Boolean> isComponentEnabledList = new ArrayList<>();
         int size = getCount();
         for (int i = 0; i < size; i++) {
-            mIsComponentCheckedList.add(isComponentEnabled(getItem(i)));
+            isComponentEnabledList.add(isComponentEnabled(getItem(i)));
         }
+        return isComponentEnabledList;
     }
 
     @Override