Enable app restriction proxy code on L and M.

Bug: 26111675
Change-Id: Ib9d2987429401c53fd9151f8c8703bb30a9c5346

Author: fredast

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

@@ -294,8 +294,8 @@ public class PolicyManagementFragment extends BaseSearchablePolicyPreferenceFrag
     };
 
     private static String[] NYC_PLUS_PREFERENCES = {
-            APP_RESTRICTIONS_MANAGING_PACKAGE_KEY, REBOOT_KEY, REMOVE_KEY_CERTIFICATE_KEY,
-            SET_ALWAYS_ON_VPN_KEY, SHOW_WIFI_MAC_ADDRESS_KEY, SUSPEND_APPS_KEY, UNSUSPEND_APPS_KEY,
+            REBOOT_KEY, REMOVE_KEY_CERTIFICATE_KEY, SET_ALWAYS_ON_VPN_KEY,
+            SHOW_WIFI_MAC_ADDRESS_KEY, SUSPEND_APPS_KEY, UNSUSPEND_APPS_KEY,
             SET_SHORT_SUPPORT_MESSAGE_KEY, SET_LONG_SUPPORT_MESSAGE_KEY, REQUEST_BUGREPORT_KEY,
             ENABLE_PROCESS_LOGGING, REQUEST_PROCESS_LOGS, CREATE_AND_MANAGE_USER_KEY
     };

app/src/main/java/com/afwsamples/testdpc/profilepolicy/apprestrictions/AppRestrictionsManagingPackageFragment.java

@@ -30,19 +30,22 @@
 
 /**
  * This fragment lets the user select an app that can manage application restrictions for the
- * current user. Related APIs:
- * 1) {@link DevicePolicyManager#setApplicationRestrictionsManagingPackage}
- * 2) {@link DevicePolicyManager#getApplicationRestrictionsManagingPackage}
- * 3) {@link DevicePolicyManager#isCallerApplicationRestrictionsManagingPackage}
+ * current user.
+ *
+ * <p>On Android N and after, it allows the selected app to call the DevicePolicyManager APIs using:
+ * {@link DevicePolicyManager#setApplicationRestrictionsManagingPackage}
+ * {@link DevicePolicyManager#getApplicationRestrictionsManagingPackage}
+ *
+ * <p>On Android M and before, it allows the selected app to proxy API calls to DevicePolicyManager
+ * via TestDPC, see {@link AppRestrictionsProxyHandler}.
  */
-@TargetApi(Build.VERSION_CODES.N)
 public class AppRestrictionsManagingPackageFragment extends SelectAppFragment {
 
     private DevicePolicyManager mDpm;
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        mDpm = (DevicePolicyManager) getContext().getSystemService(Context.DEVICE_POLICY_SERVICE);
+        mDpm = (DevicePolicyManager) getActivity().getSystemService(Context.DEVICE_POLICY_SERVICE);
     }
 
     @Override
@@ -57,11 +60,10 @@ protected void setSelectedPackage(String pkgName) {
         if (TextUtils.isEmpty(pkgName)) {
             pkgName = null;
         }
-        try {
-            mDpm.setApplicationRestrictionsManagingPackage(
-                    DeviceAdminReceiver.getComponentName(getActivity()), pkgName);
-        } catch (NameNotFoundException nnpe) {
-            throw new IllegalArgumentException(nnpe);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            setApplicationRestrictionsManagingPackage(pkgName);
+        } else {
+            setApplicationRestrictionsManagingPackageWithProxy(pkgName);
         }
     }
 
@@ -72,7 +74,35 @@ protected void clearSelectedPackage() {
 
     @Override
     protected String getSelectedPackage() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            return getApplicationRestrictionsManagingPackage();
+        } else {
+            return getApplicationRestrictionsManagingPackageWithProxy();
+        }
+    }
+
+    @TargetApi(Build.VERSION_CODES.N)
+    private void setApplicationRestrictionsManagingPackage(String pkgName) {
+        try {
+            mDpm.setApplicationRestrictionsManagingPackage(
+                DeviceAdminReceiver.getComponentName(getActivity()), pkgName);
+        } catch (NameNotFoundException e) {
+            throw new IllegalArgumentException(e);
+        }
+    }
+
+    private void setApplicationRestrictionsManagingPackageWithProxy(String pkgName) {
+        AppRestrictionsProxyHandler.setApplicationRestrictionsManagingPackage(
+            getActivity(), pkgName);
+    }
+
+    @TargetApi(Build.VERSION_CODES.N)
+    private String getApplicationRestrictionsManagingPackage() {
         return mDpm.getApplicationRestrictionsManagingPackage(
-                DeviceAdminReceiver.getComponentName(getActivity()));
+            DeviceAdminReceiver.getComponentName(getActivity()));
+    }
+
+    private String getApplicationRestrictionsManagingPackageWithProxy() {
+        return AppRestrictionsProxyHandler.getApplicationRestrictionsManagingPackage(getActivity());
     }
 }