diff options
| author | 2022-05-04 20:42:48 +0000 | |
|---|---|---|
| committer | 2022-05-04 20:42:48 +0000 | |
| commit | d8a13fd01e6a7c17490f507e433a24a2324cb01d (patch) | |
| tree | 52189607c79332d8bc9810d9b3ad71faf90db837 | |
| parent | 3079ea52c716cd78dba3635bb56a696f23587c86 (diff) | |
| parent | 2988f1cf2f80f3a83e1571ef7bd5c98a8ed3ab76 (diff) | |
Merge "Revert "Remove REVIEW_REQUIRED from droidfooder phones"" into tm-dev
| -rw-r--r-- | services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java index 2277d8a8ecee..7be83b03243a 100644 --- a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java +++ b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java @@ -2816,14 +2816,12 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt } // Remove review flag as it is not necessary anymore - // TODO(b/227186603) re-enable check for notification permission once - // droidfood state has been cleared - //if (!NOTIFICATION_PERMISSIONS.contains(perm)) { + if (!NOTIFICATION_PERMISSIONS.contains(perm)) { if ((flags & FLAG_PERMISSION_REVIEW_REQUIRED) != 0) { flags &= ~FLAG_PERMISSION_REVIEW_REQUIRED; wasChanged = true; } - //} + } if ((flags & FLAG_PERMISSION_REVOKED_COMPAT) != 0 && !isPermissionSplitFromNonRuntime(permName, |