Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d2ff2732 authored by Hai Zhang's avatar Hai Zhang Committed by Automerger Merge Worker
Browse files

Merge "Revert "Fix wrong permission state changed being notified"" am: f66d53b5 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2619789



Change-Id: I4c20fe30c2576794f63b94719ea86af04165aead
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 17b3833c f66d53b5

services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java

+3 −1
Original line number Diff line number Diff line
@@ -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)) {