Merge "Added Shell commands to manage permission grants." into ub-testdpc-sc

Author: TreeHugger Robot

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

@@ -380,6 +380,17 @@ void setApplicationRestrictions(String packageName, Bundle settings,
      */
     Bundle getSelfRestrictions();
 
+    /**
+     * See {@link android.app.admin.DevicePolicyManager#setPermissionGrantState(ComponentName, String, String, int)}.
+     */
+    void setPermissionGrantState(String packageName, String permission, int grantState,
+            @NonNull Consumer<Boolean> onSuccess, @NonNull Consumer<Exception> onError);
+
+    /**
+     * See {@link android.app.admin.DevicePolicyManager#getPermissionGrantState(ComponentName, String, String)}.
+     */
+    int getPermissionGrantState(String packageName, String permission);
+
     /**
      * Used on error callbacks to indicate a {@link android.app.admin.DevicePolicyManager} method
      * call failed.

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

@@ -727,6 +727,29 @@ public void setApplicationRestrictions(String packageName, Bundle settings,
         }
     }
 
+    @Override
+    public void setPermissionGrantState(String packageName, String permission, int grantState,
+            Consumer<Boolean> onSuccess, Consumer<Exception> onError) {
+        Log.d(TAG, "setPermissionGrantState(" + packageName + ", " + permission + "): "
+                + Util.grantStateToString(grantState));
+        try {
+            boolean result = mDevicePolicyManager.setPermissionGrantState(mAdminComponentName,
+                    packageName, permission, grantState);
+            onSuccess.accept(result);
+        } catch (Exception e) {
+            onError.accept(e);
+        }
+    }
+
+    @Override
+    public int getPermissionGrantState(String packageName, String permission) {
+        int grantState = mDevicePolicyManager.getPermissionGrantState(mAdminComponentName,
+                packageName, permission);
+        Log.d(TAG, "getPermissionGrantState(" + packageName + ", " + permission + "): "
+                + Util.grantStateToString(grantState));
+        return grantState;
+    }
+
     @Override
     public String toString() {
         return "DevicePolicyManagerGatewayImpl[" + mAdminComponentName + "]";

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

@@ -95,6 +95,8 @@ final class ShellCommand {
     private static final String CMD_GET_LOCK_TASK_FEATURES = "get-lock-task-features";
     private static final String CMD_SET_APP_RESTRICTIONS = "set-app-restrictions";
     private static final String CMD_GET_APP_RESTRICTIONS = "get-app-restrictions";
+    private static final String CMD_SET_PERMISSION_GRANT_STATE = "set-permission-grant-state";
+    private static final String CMD_GET_PERMISSION_GRANT_STATE = "get-permission-grant-state";
 
     // Commands for APIs added on Android S
     private static final String CMD_SET_PERMITTED_INPUT_METHODS_PARENT =
@@ -269,6 +271,12 @@ public void run() {
             case CMD_GET_APP_RESTRICTIONS:
                 execute(() -> getAppRestrictions());
                 break;
+            case CMD_SET_PERMISSION_GRANT_STATE:
+                execute(() -> setPermissionGrantState());
+                break;
+            case CMD_GET_PERMISSION_GRANT_STATE:
+                execute(() -> getPermissionGrantState());
+                break;
             default:
                 mWriter.printf("Invalid command: %s\n\n", cmd);
                 showUsage();
@@ -369,6 +377,13 @@ private void showUsage() {
         mWriter.printf("\t%s [PKG1] [PKGNn] - get the application restrictions for the given apps, "
                 + "or for TestDPC itself (using UserManager) when PKG is not passed\n",
                 CMD_GET_APP_RESTRICTIONS);
+        mWriter.printf("\t%s <PKG> <PERMISSION> <STATE> - set the grant state for the given "
+                + "package / permission\n",
+                CMD_SET_PERMISSION_GRANT_STATE);
+        mWriter.printf("\t%s <PKG> <PERMISSION> - get the grant state for the given permission / "
+                + "package\n", CMD_GET_PERMISSION_GRANT_STATE);
+
+        // Separator for S / pre-S commands - do NOT remove line to avoid cherry-pick conflicts
 
         if (Util.isAtLeastS()) {
             mWriter.printf("\t%s <true|false> - enable / disable USB data signaling\n",
@@ -853,6 +868,29 @@ private void printAppRestrictions(String packageName, Bundle settings) {
         }
     }
 
+    private void setPermissionGrantState() {
+        // TODO(b/171350084): check args
+        String packageName = mArgs[1];
+        String permission = mArgs[2];
+        int grantState = getIntArg(3);
+        String grantName = Util.grantStateToString(grantState);
+
+        mDevicePolicyManagerGateway.setPermissionGrantState(packageName, permission, grantState,
+                (v) -> onSuccess("Set %s state on %s to %s", permission, packageName, grantName),
+                (e) -> onError(e, "Error setting %s state on %s to %s", packageName, permission,
+                        grantName));
+    }
+
+    private void getPermissionGrantState() {
+        // TODO(b/171350084): check args
+        String packageName = mArgs[1];
+        String permission = mArgs[2];
+        int grantState = mDevicePolicyManagerGateway.getPermissionGrantState(packageName,
+                permission);
+        mWriter.printf("%s state for %s: %s\n", permission, packageName,
+                Util.grantStateToString(grantState));
+    }
+
     private static String permittedToString(boolean permitted) {
         return permitted ? "PERMITTED" : "NOT PERMITTED";
     }

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

@@ -268,6 +268,10 @@ public static String personalAppsSuspensionReasonToString(int reasons) {
         return flagsToString(DevicePolicyManager.class, "PERSONAL_APPS_", reasons);
     }
 
+    public static String grantStateToString(int grantState) {
+        return constantToString(DevicePolicyManager.class, "PERMISSION_GRANT_STATE_", grantState);
+    }
+
     public static void onSuccessLog(String tag, String template, Object... args) {
         Log.d(tag, String.format(template, args) + " succeeded");
     }
@@ -310,6 +314,22 @@ public static String flagsToString(Class<?> clazz, String prefix, int flags) {
         return res.toString();
     }
 
+    // Copied from DebugUtils
+    public static String constantToString(Class<?> clazz, String prefix, int value) {
+        for (Field field : clazz.getDeclaredFields()) {
+            final int modifiers = field.getModifiers();
+            try {
+                if (Modifier.isStatic(modifiers) && Modifier.isFinal(modifiers)
+                        && field.getType().equals(int.class) && field.getName().startsWith(prefix)
+                        && field.getInt(null) == value) {
+                    return constNameWithoutPrefix(prefix, field);
+                }
+            } catch (IllegalAccessException ignored) {
+            }
+        }
+        return prefix + Integer.toString(value);
+    }
+
     // Copied from DebugUtils
     private static String constNameWithoutPrefix(String prefix, Field field) {
         return field.getName().substring(prefix.length());