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

Merge "Don't reset review state until no permission requires a review."

Browse Source
This commit is contained in:
Svetoslav Ganov
2017-07-18 20:11:19 +00:00
committed by Android (Google) Code Review
parent 6c790c2cf8 587512a0cf
commit 7cb10dd76e
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -427,7 +427,7 @@ public final class PermissionsState {
mPermissionReviewRequired.put(userId, true);
} else if ((oldFlags & PackageManager.FLAG_PERMISSION_REVIEW_REQUIRED) != 0
&& (newFlags & PackageManager.FLAG_PERMISSION_REVIEW_REQUIRED) == 0) {
if (mPermissionReviewRequired != null) {
if (mPermissionReviewRequired != null && !hasPermissionRequiringReview(userId)) {
mPermissionReviewRequired.delete(userId);
if (mPermissionReviewRequired.size() <= 0) {
mPermissionReviewRequired = null;
@@ -438,6 +438,18 @@ public final class PermissionsState {
return updated;
}
private boolean hasPermissionRequiringReview(int userId) {
final int permissionCount = mPermissions.size();
for (int i = 0; i < permissionCount; i++) {
final PermissionData permission = mPermissions.valueAt(i);
if ((permission.getFlags(userId)
& PackageManager.FLAG_PERMISSION_REVIEW_REQUIRED) != 0) {
return true;
}
}
return false;
}
public boolean updatePermissionFlagsForAllPermissions(
int userId, int flagMask, int flagValues) {
enforceValidUserId(userId);