Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: Ic071d3b273e234d1efadaa4e49122b982b2b7739
This commit is contained in:
Automerger Merge Worker
2020-02-26 19:57:32 +00:00
parent d9e8220ef5 7afd9b9af7
commit a6baa49614
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
services/core/java/com/android/server/am/ActiveServices.java
View File

@@ -4869,6 +4869,19 @@ public final class ActiveServices {
return true; 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) if (mAm.checkPermission(START_ACTIVITIES_FROM_BACKGROUND, callingPid, callingUid)
== PERMISSION_GRANTED) { == PERMISSION_GRANTED) {
return true; return true;