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

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

Merge "Fix wrong permission state changed being notified" am: ab62c6d5 am:... 

Merge "Fix wrong permission state changed being notified" am: ab62c6d5 am: 3cb7b3bb am: 9deb015e am: 321e06b7 am: 8030a02f am: 546b7114

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



Change-Id: Ib0c6a39956884093d8d7fbdaa5ada6b371292ab8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f9965d15 546b7114

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

+1 −3
Original line number Diff line number Diff line
@@ -2833,9 +2833,7 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt 
                            } else if (!permissionPolicyInitialized

                                    || (!hardRestricted || restrictionExempt)) {

                                if ((origPermState != null && origPermState.isGranted())) {

                                    if (!uidState.grantPermission(bp)) {

                                        wasChanged = true;

                                    }

                                    uidState.grantPermission(bp);

                                }

                            }

                            if (mIsLeanback && NOTIFICATION_PERMISSIONS.contains(permName)) {