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

Commit 5302b621 authored by Svetoslav Ganov's avatar Svetoslav Ganov Committed by android-build-merger
Browse files

Merge "Use correct user id for permission check for instant foreground service" am: b76e9845 

am: 2ba5aba3

Change-Id: I45396cd0b375cae8c97e9d8f7da6a4c38e703e48
parents ff8201b3 2ba5aba3

services/core/java/com/android/server/am/ActiveServices.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -1043,8 +1043,8 @@ public final class ActiveServices { 
                        try {

                        try {

                            if (AppGlobals.getPackageManager().checkPermission(

                            if (AppGlobals.getPackageManager().checkPermission(

                                    android.Manifest.permission.INSTANT_APP_FOREGROUND_SERVICE,

                                    android.Manifest.permission.INSTANT_APP_FOREGROUND_SERVICE,

                                    r.appInfo.packageName,

                                    r.appInfo.packageName, UserHandle.getUserId(r.appInfo.uid))

                                    r.appInfo.uid) != PackageManager.PERMISSION_GRANTED) {

                                            != PackageManager.PERMISSION_GRANTED) {

                                throw new SecurityException("Instant app " + r.appInfo.packageName

                                throw new SecurityException("Instant app " + r.appInfo.packageName

                                        + " does not have permission to create foreground"

                                        + " does not have permission to create foreground"

                                        + "services");

                                        + "services");