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

Merge "Check flags for user in SoftRestrictedPermPolicy" into qt-dev

Browse Source 
am: 674e1600c9

Change-Id: Ia2f09edd205d74fe7d542d17aca353f73e950171
This commit is contained in:
Philip P. Moltmann
2019-06-17 20:05:50 -07:00
committed by android-build-merger
parent 7c82454948 674e1600c9
commit 26434bd1b9
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/pm/permission/PermissionManagerService.java
View File

@@ -2129,7 +2129,7 @@ public class PermissionManagerService {
} }
if (bp.isSoftRestricted() && !SoftRestrictedPermissionPolicy.forPermission(mContext, if (bp.isSoftRestricted() && !SoftRestrictedPermissionPolicy.forPermission(mContext,
pkg.applicationInfo, permName).canBeGranted()) { pkg.applicationInfo, UserHandle.of(userId), permName).canBeGranted()) {
Log.e(TAG, "Cannot grant soft restricted permission " + permName + " for package " Log.e(TAG, "Cannot grant soft restricted permission " + permName + " for package "
+ packageName); + packageName);
return; return;

2
services/core/java/com/android/server/policy/PermissionPolicyService.java
View File

@@ -414,7 +414,7 @@ public final class PermissionPolicyService extends SystemService {
} else if (permissionInfo.isSoftRestricted()) { } else if (permissionInfo.isSoftRestricted()) {
final SoftRestrictedPermissionPolicy policy = final SoftRestrictedPermissionPolicy policy =
SoftRestrictedPermissionPolicy.forPermission(mContext, pkg.applicationInfo, SoftRestrictedPermissionPolicy.forPermission(mContext, pkg.applicationInfo,
permission); mContext.getUser(), permission);
if (opCode != OP_NONE) { if (opCode != OP_NONE) {
if (policy.canBeGranted()) { if (policy.canBeGranted()) {

7
services/core/java/com/android/server/policy/SoftRestrictedPermissionPolicy.java
View File

@@ -33,6 +33,7 @@ import android.app.AppOpsManager;
import android.content.Context; import android.content.Context;
import android.content.pm.ApplicationInfo; import android.content.pm.ApplicationInfo;
import android.os.Build; import android.os.Build;
import android.os.UserHandle;
/** /**
* The behavior of soft restricted permissions is different for each permission. This class collects * The behavior of soft restricted permissions is different for each permission. This class collects
@@ -75,12 +76,14 @@ public abstract class SoftRestrictedPermissionPolicy {
* *
* @param context A context to use * @param context A context to use
* @param appInfo The application the permission belongs to * @param appInfo The application the permission belongs to
* @param user The user the app belongs to
* @param permission The name of the permission * @param permission The name of the permission
* *
* @return The policy for this permission * @return The policy for this permission
*/ */
public static @NonNull SoftRestrictedPermissionPolicy forPermission(@NonNull Context context, public static @NonNull SoftRestrictedPermissionPolicy forPermission(@NonNull Context context,
@NonNull ApplicationInfo appInfo, @NonNull String permission) { @NonNull ApplicationInfo appInfo, @NonNull UserHandle user,
@NonNull String permission) {
switch (permission) { switch (permission) {
// Storage uses a special app op to decide the mount state and supports soft restriction // Storage uses a special app op to decide the mount state and supports soft restriction
// where the restricted state allows the permission but only for accessing the medial // where the restricted state allows the permission but only for accessing the medial
@@ -88,7 +91,7 @@ public abstract class SoftRestrictedPermissionPolicy {
case READ_EXTERNAL_STORAGE: case READ_EXTERNAL_STORAGE:
case WRITE_EXTERNAL_STORAGE: { case WRITE_EXTERNAL_STORAGE: {
int flags = context.getPackageManager().getPermissionFlags( int flags = context.getPackageManager().getPermissionFlags(
permission, appInfo.packageName, context.getUser()); permission, appInfo.packageName, user);
boolean applyRestriction = (flags & FLAG_PERMISSION_APPLY_RESTRICTION) != 0; boolean applyRestriction = (flags & FLAG_PERMISSION_APPLY_RESTRICTION) != 0;
boolean isWhiteListed = (flags & FLAGS_PERMISSION_RESTRICTION_ANY_EXEMPT) != 0; boolean isWhiteListed = (flags & FLAGS_PERMISSION_RESTRICTION_ANY_EXEMPT) != 0;
boolean hasRequestedLegacyExternalStorage = boolean hasRequestedLegacyExternalStorage =