From 2ae505dd6b71908dc9ee59db1576caf4e90febb4 Mon Sep 17 00:00:00 2001
From: Hai Zhang <zhanghai@google.com>
Date: Wed, 7 Jun 2023 18:24:44 +0000
Subject: Revert "Fix wrong permission state changed being notified"

This reverts commit 50430804ef1ec804b1576e8048ab21894365d2a2.

Reason for revert: Performance regression

Bug: 285084131
Fixes: 285669216
Test: presubmit
Change-Id: Ifc79f645674d68c7945a242b998fb842637d121a
---
 .../android/server/pm/permission/PermissionManagerServiceImpl.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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 b92e73c49367..554e2690b878 100644
--- a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java
+++ b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java
@@ -2868,7 +2868,9 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt
                             } else if (!permissionPolicyInitialized
                                     || (!hardRestricted || restrictionExempt)) {
                                 if ((origPermState != null && origPermState.isGranted())) {
-                                    uidState.grantPermission(bp);
+                                    if (!uidState.grantPermission(bp)) {
+                                        wasChanged = true;
+                                    }
                                 }
                             }
                             if (mIsLeanback && NOTIFICATION_PERMISSIONS.contains(permName)) {
-- 
cgit v1.2.3-59-g8ed1b