Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 2cf92e602a

Change-Id: I4fc612636cf9168166ccccb85086e5bab171ad54
This commit is contained in:
Svet Ganov
2019-05-03 05:25:06 -07:00
committed by android-build-merger
parent 640481365f 2cf92e602a
commit 3367c62bc2
2 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/content/pm/PackageInstaller.java
View File

@@ -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)
*/

5
services/core/java/com/android/server/appop/AppOpsService.java
View File

@@ -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) {