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

Commit a6baa496 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Pass START_ACTIVITIES_FROM_BACKGROUND permission to instrumentation... 

Merge "Pass START_ACTIVITIES_FROM_BACKGROUND permission to instrumentation test." into rvc-dev am: 7afd9b9a

Change-Id: Ic071d3b273e234d1efadaa4e49122b982b2b7739
parents d9e8220e 7afd9b9a

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

+13 −0
Original line number Diff line number Diff line
@@ -4869,6 +4869,19 @@ public final class ActiveServices { 
            return true;

        }



        if (r.app != null) {

            ActiveInstrumentation instr = r.app.getActiveInstrumentation();

            if (instr != null && instr.mHasBackgroundActivityStartsPermission) {

                return true;

            }

        }



        final boolean hasAllowBackgroundActivityStartsToken = r.app != null

                ? !r.app.mAllowBackgroundActivityStartsTokens.isEmpty() : false;

        if (hasAllowBackgroundActivityStartsToken) {

            return true;

        }



        if (mAm.checkPermission(START_ACTIVITIES_FROM_BACKGROUND, callingPid, callingUid)

                == PERMISSION_GRANTED) {

            return true;