From 2988f1cf2f80f3a83e1571ef7bd5c98a8ed3ab76 Mon Sep 17 00:00:00 2001 From: Nate Myren Date: Tue, 3 May 2022 22:36:38 +0000 Subject: [PATCH] Revert "Remove REVIEW_REQUIRED from droidfooder phones" This reverts commit 618578e8cb9115eed6d96aec70c9dd355edde1e0. Reason for revert: merged through droidfood weekly Change-Id: I902489ca2cfa488889912515524c118745849a5a --- .../server/pm/permission/PermissionManagerServiceImpl.java | 6 ++---- 1 file 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 260b3b41b8e3e..c524fb7ae9e57 100644 --- a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java +++ b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java @@ -2800,14 +2800,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,