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

Commit f43f36c8 authored by Nate Myren's avatar Nate Myren Committed by Automerger Merge Worker
Browse files

Merge "Remove temp handling of POST_NOTIFICATIONS" into tm-dev am: 65dc0639 am: d45efacb 

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



Change-Id: I7e6aedc0e199b47092d7f4ef2f6049786b8a1b73
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 24d33b6b d45efacb

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

+1 −4
Original line number Diff line number Diff line
@@ -2650,12 +2650,9 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt 


                    // Cache newImplicitPermissions before modifing permissionsState as for the

                    // shared uids the original and new state are the same object

                    // TODO(205888750): remove the line for LEGACY_REVIEW once propagated through

                    // droidfood

                    if (!origState.hasPermissionState(permName)

                            && (pkg.getImplicitPermissions().contains(permName)

                            || (permName.equals(Manifest.permission.ACTIVITY_RECOGNITION)))

                            || NOTIFICATION_PERMISSIONS.contains(permName)) {

                            || (permName.equals(Manifest.permission.ACTIVITY_RECOGNITION)))) {

                        if (pkg.getImplicitPermissions().contains(permName)) {

                            // If permName is an implicit permission, try to auto-grant

                            newImplicitPermissions.add(permName);