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

Merge "Revert "Remove REVIEW_REQUIRED from droidfooder phones"" into tm-dev am: d8a13fd01e am: c7eb88014d

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18149050

Change-Id: I3b15ff53c8eccd8860a0fa2e818064cfef769f84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Nate Myren
2022-05-04 21:20:22 +00:00
committed by Automerger Merge Worker
parent 51d00903df c7eb88014d
commit bd6435b6ed
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java
View File

@@ -2816,14 +2816,12 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt
} }
// Remove review flag as it is not necessary anymore // Remove review flag as it is not necessary anymore
// TODO(b/227186603) re-enable check for notification permission once if (!NOTIFICATION_PERMISSIONS.contains(perm)) {
// droidfood state has been cleared
//if (!NOTIFICATION_PERMISSIONS.contains(perm)) {
if ((flags & FLAG_PERMISSION_REVIEW_REQUIRED) != 0) { if ((flags & FLAG_PERMISSION_REVIEW_REQUIRED) != 0) {
flags &= ~FLAG_PERMISSION_REVIEW_REQUIRED; flags &= ~FLAG_PERMISSION_REVIEW_REQUIRED;
wasChanged = true; wasChanged = true;
} }
//} }
if ((flags & FLAG_PERMISSION_REVOKED_COMPAT) != 0 if ((flags & FLAG_PERMISSION_REVOKED_COMPAT) != 0
&& !isPermissionSplitFromNonRuntime(permName, && !isPermissionSplitFromNonRuntime(permName,