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

Revert "Reset any non-runtime permissions with user sensitive"

Browse Source 
This reverts commit c690062ee1.

Reason for revert: Has propagated through droidfood. Flags are repaired
Bug: 6355618

Change-Id: If7718fe1631e98569c25bfd7b3a6b07162e621b9
This commit is contained in:
Nate Myren
2020-04-24 19:56:48 +00:00
parent c690062ee1
commit 7fb699567b
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

@@ -2497,24 +2497,10 @@ public class PermissionManagerService extends IPermissionManager.Stub {
synchronized (mLock) {
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();
for (int i = 0; i < N; i++) {
final String permName = pkg.getRequestedPermissions().get(i);
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 =
pkg.getTargetSdkVersion() >= Build.VERSION_CODES.M;
String upgradedActivityRecognitionPermission = null;