Merge "Pass START_ACTIVITIES_FROM_BACKGROUND permission to instrumentation test." into rvc-dev (7afd9b9a) · Commits · e / os / android_frameworks_base

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;