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

Commit 07d7994e 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: 143e8054 

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



Change-Id: I17e10f3f35397ef93ad632585a90ff3fb45852d4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 399dab75 143e8054

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

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




                    // Cache newImplicitPermissions before modifing permissionsState as for the

                    // Cache newImplicitPermissions before modifing permissionsState as for the

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

                    // 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)

                    if (!origState.hasPermissionState(permName)

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

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

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

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

                            || NOTIFICATION_PERMISSIONS.contains(permName)) {

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

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

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

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

                            newImplicitPermissions.add(permName);

                            newImplicitPermissions.add(permName);