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

Commit aeb04893 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 am: d2ff2732 

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



Change-Id: I07db4c9c00ae29a30681fe60bb33f28ae701081a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3d1eb8b5 d2ff2732

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

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

                            } else if (!permissionPolicyInitialized

                                    || (!hardRestricted || restrictionExempt)) {

                                    || (!hardRestricted || restrictionExempt)) {

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

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

                                    uidState.grantPermission(bp);

                                    if (!uidState.grantPermission(bp)) {

                                        wasChanged = true;

                                    }

                                }

                                }

                            }

                            }

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

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