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

Exempt callingUid that has START_ACTIVITIES_FROM_BACKGROUND

Browse Source 
permission.

From background FGS while-in-use permission restriction.

Bug: 149835015, 136219221
Test: adb shell dumpsys activity -a
Change-Id: I1a23689a2939d15101a1d8bb21a85fc9a9cca31f
(cherry picked from commit d731201cac)
This commit is contained in:
Hui Yu
2020-02-21 18:11:18 -08:00
parent 2c89e32d34
commit 5c8ceade92
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,6 +16,7 @@
package com.android.server.am;
import static android.Manifest.permission.START_ACTIVITIES_FROM_BACKGROUND;
import static android.content.pm.PackageManager.PERMISSION_GRANTED;
import static android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_LOCATION;
import static android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_MANIFEST;
@@ -685,8 +686,8 @@ public final class ActiveServices {
if (!r.mAllowWhileInUsePermissionInFgs) {
r.mAllowWhileInUsePermissionInFgs =
shouldAllowWhileInUsePermissionInFgsLocked(callingPackage, callingUid,
service, r, allowBackgroundActivityStarts);
shouldAllowWhileInUsePermissionInFgsLocked(callingPackage, callingPid,
callingUid, service, r, allowBackgroundActivityStarts);
}
return cmp;
@@ -1865,9 +1866,9 @@ public final class ActiveServices {
}
if (!s.mAllowWhileInUsePermissionInFgs) {
final int callingUid = Binder.getCallingUid();
s.mAllowWhileInUsePermissionInFgs =
shouldAllowWhileInUsePermissionInFgsLocked(callingPackage, callingUid,
shouldAllowWhileInUsePermissionInFgsLocked(callingPackage,
Binder.getCallingPid(), Binder.getCallingUid(),
service, s, false);
}
@@ -4625,7 +4626,8 @@ public final class ActiveServices {
* @return true if allow, false otherwise.
*/
private boolean shouldAllowWhileInUsePermissionInFgsLocked(String callingPackage,
int callingUid, Intent intent, ServiceRecord r, boolean allowBackgroundActivityStarts) {
int callingPid, int callingUid, Intent intent, ServiceRecord r,
boolean allowBackgroundActivityStarts) {
// Is the background FGS start restriction turned on?
if (!mAm.mConstants.mFlagBackgroundFgsStartRestrictionEnabled) {
return true;
@@ -4635,13 +4637,6 @@ public final class ActiveServices {
return true;
}
// Is the service in a whitelist?
final boolean hasAllowBackgroundActivityStartsToken = r.app != null
? r.app.mAllowBackgroundActivityStartsTokens.contains(r) : false;
if (hasAllowBackgroundActivityStartsToken) {
return true;
}
boolean isCallerSystem = false;
final int callingAppId = UserHandle.getAppId(callingUid);
switch (callingAppId) {
@@ -4660,6 +4655,11 @@ public final class ActiveServices {
return true;
}
if (mAm.checkPermission(START_ACTIVITIES_FROM_BACKGROUND, callingPid, callingUid)
== PERMISSION_GRANTED) {
return true;
}
// Is the calling UID at PROCESS_STATE_TOP or above?
final boolean isCallingUidTopApp = appIsTopLocked(callingUid);
if (isCallingUidTopApp) {