Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2cf92e60 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Address some comments for the soft restriction CL" into qt-dev

parents 501152f9 b687fad0

core/java/android/content/pm/PackageInstaller.java

+0 −5
Original line number Diff line number Diff line
@@ -1509,11 +1509,6 @@ public class PackageInstaller { 
         * state of the permission can be determined only at install time and cannot be

         * changed on updated or at a later point via the package manager APIs.

         *

         * <p>The whitelisted non-immutably restricted permissions would be added to

         * the {@link PackageManager#FLAG_PERMISSION_WHITELIST_INSTALLER installer whitelist}

         * while the immutably restricted permissions would be added to the {@link

         * PackageManager#FLAG_PERMISSION_WHITELIST_SYSTEM system whitelist}

         *

         * @see PackageManager#addWhitelistedRestrictedPermission(String, String, int)

         * @see PackageManager#removeWhitelistedRestrictedPermission(String, String, int)

         */

services/core/java/com/android/server/appop/AppOpsService.java

+2 −3
Original line number Diff line number Diff line
@@ -3292,7 +3292,7 @@ public class AppOpsService extends IAppOpsService.Stub { 
        pw.println("    Starts a given operation for a particular application.");

        pw.println("  stop [--user <USER_ID>] <PACKAGE | UID> <OP> ");

        pw.println("    Stops a given operation for a particular application.");

        pw.println("  set [--user <USER_ID>] <--uid PACKAGE | PACKAGE | UID> <OP> <MODE>");

        pw.println("  set [--user <USER_ID>] <[--uid] PACKAGE | UID> <OP> <MODE>");

        pw.println("    Set the mode for a particular application and operation.");

        pw.println("  get [--user <USER_ID>] <PACKAGE | UID> [<OP>]");

        pw.println("    Return the mode for a particular application and optional operation.");
@@ -3305,12 +3305,11 @@ public class AppOpsService extends IAppOpsService.Stub { 
        pw.println("  read-settings");

        pw.println("    Read the last written settings, replacing current state in RAM.");

        pw.println("  options:");

        pw.println("    <PACKAGE> an Android package name.");

        pw.println("    <PACKAGE> an Android package name or its UID if prefixed by --uid");

        pw.println("    <OP>      an AppOps operation.");

        pw.println("    <MODE>    one of allow, ignore, deny, or default");

        pw.println("    <USER_ID> the user id under which the package is installed. If --user is not");

        pw.println("              specified, the current user is assumed.");

        pw.println("    --uid PACKAGE refer to the UID of the package");

    }



    static int onShellCommand(Shell shell, String cmd) {