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

Merge "Revert "Reset any non-runtime permissions with user sensitive"" into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-04-28 01:49:46 +00:00
committed by Android (Google) Code Review
parent 4ce06dff0a 7fb699567b
commit ceeef843fa
1 changed files with 0 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2499,24 +2499,10 @@ public class PermissionManagerService extends IPermissionManager.Stub {
synchronized (mLock) { synchronized (mLock) {
ArraySet<String> newImplicitPermissions = new ArraySet<>(); ArraySet<String> newImplicitPermissions = new ArraySet<>();
// TODO ntmyren: Remove once propagated to droidfood
int flagMask = PackageManager.FLAG_PERMISSION_USER_SENSITIVE_WHEN_GRANTED
| PackageManager.FLAG_PERMISSION_USER_SENSITIVE_WHEN_DENIED;
int user = UserHandle.getUserId(pkg.getUid());
final int N = pkg.getRequestedPermissions().size(); final int N = pkg.getRequestedPermissions().size();
for (int i = 0; i < N; i++) { for (int i = 0; i < N; i++) {
final String permName = pkg.getRequestedPermissions().get(i); final String permName = pkg.getRequestedPermissions().get(i);
final BasePermission bp = mSettings.getPermissionLocked(permName); final BasePermission bp = mSettings.getPermissionLocked(permName);
// TODO ntmyren: Remove once propagated to droidfood
if (bp != null && !bp.isRuntime()) {
PermissionState permState = permissionsState.getInstallPermissionState(bp.name);
if (permState == null || (permState.getFlags() & flagMask) != 0) {
permissionsState.updatePermissionFlags(bp, user, flagMask, 0);
}
}
final boolean appSupportsRuntimePermissions = final boolean appSupportsRuntimePermissions =
pkg.getTargetSdkVersion() >= Build.VERSION_CODES.M; pkg.getTargetSdkVersion() >= Build.VERSION_CODES.M;
String upgradedActivityRecognitionPermission = null; String upgradedActivityRecognitionPermission = null;