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

Commit c29e6d90 authored by Svet Ganov's avatar Svet Ganov Committed by android-build-team Robot
Browse files

Use correct user id for permission check for instant foreground service 

Test: cts-tradefed run cts-dev -m CtsAppSecurityHostTestCases
          -t android.appsecurity.cts.EphemeralTest#testStartForegrondService

bug: 68275646
Bug: 71366502

Change-Id: I196522c49ae8a7e0ec07bf631f04bae51e96db5b

cherry pick from: https://android-review.googlesource.com/c/platform/frameworks/base/+/559340
(cherry picked from commit e32c238ce76151dd6221e6762f841c8f721c45f7)

Change-Id: Idfeae038d42b9dee9f6f57203f2bdb0764f51877
(cherry picked from commit d967610f)
parent acf6d767

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

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

                            if (AppGlobals.getPackageManager().checkPermission(

                                    android.Manifest.permission.INSTANT_APP_FOREGROUND_SERVICE,

                                    r.appInfo.packageName,

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

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

                                            != PackageManager.PERMISSION_GRANTED) {

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

                                        + " does not have permission to create foreground"

                                        + "services");