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

Commit 7bb698df authored by Philip P. Moltmann's avatar Philip P. Moltmann Committed by Android (Google) Code Review
Browse files

Merge "Only set MODE_FOREGROUND when fg app is granted"

parents 0b83fbf2 125c6eee

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

+6 −2
Original line number Diff line number Diff line
@@ -1345,8 +1345,12 @@ public class PermissionManagerService { 
                                    sourcePermNum++) {

                                String sourcePerm = sourcePerms.valueAt(sourcePermNum);



                                if (appOpsManager.unsafeCheckOpNoThrow(permissionToOp(sourcePerm),

                                        getUid(userId, getAppId(pkg.applicationInfo.uid)), pkgName)

                                if (ps.hasRuntimePermission(sourcePerm, userId)

                                        && ps.getRuntimePermissionState(sourcePerm, userId)

                                        .isGranted()

                                        && appOpsManager.unsafeCheckOpNoThrow(

                                                permissionToOp(sourcePerm), getUid(userId,

                                                getAppId(pkg.applicationInfo.uid)), pkgName)

                                        == MODE_ALLOWED) {

                                    setAppOpMode(sourcePerm, pkg, userId, MODE_FOREGROUND);

                                }