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

Call ActivityTaskManagerService's version of hasSystemAlertWindowPermission().

Browse Source 
Which checks both AppOps and PackageManager for SYSTEM_ALERT_WINDOW
permission.

Bug: 182491885.
Test: atest cts/tests/app/src/android/app/cts/ActivityManagerFgsBgStartTest.java
Change-Id: I05c19e089bb2d5daa4c8819f009eca2aa0d44c2f
This commit is contained in:
Hui Yu
2021-03-19 16:43:50 -07:00
parent 6d65ee195a
commit 34519d4dcd
3 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5623,8 +5623,8 @@ public final class ActiveServices {
}
if (ret == REASON_DENIED) {
if (mAm.checkPermission(SYSTEM_ALERT_WINDOW, callingPid,
callingUid) == PERMISSION_GRANTED) {
if (mAm.mAtmInternal.hasSystemAlertWindowPermission(callingUid, callingPid,
callingPackage)) {
ret = REASON_SYSTEM_ALERT_WINDOW_PERMISSION;
}
}

6
services/core/java/com/android/server/wm/ActivityTaskManagerInternal.java
View File

@@ -606,4 +606,10 @@ public abstract class ActivityTaskManagerInternal {
*/
void commit() throws RemoteException;
}
/**
* A utility method to check AppOps and PackageManager for SYSTEM_ALERT_WINDOW permission.
*/
public abstract boolean hasSystemAlertWindowPermission(int callingUid, int callingPid,
String callingPackage);
}

10
services/core/java/com/android/server/wm/ActivityTaskManagerService.java
View File

@@ -932,7 +932,8 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
return getUserManager().hasUserRestriction(restriction, userId);
}
boolean hasSystemAlertWindowPermission(int callingUid, int callingPid, String callingPackage) {
boolean hasSystemAlertWindowPermission(int callingUid, int callingPid,
String callingPackage) {
final int mode = getAppOpsManager().noteOpNoThrow(AppOpsManager.OP_SYSTEM_ALERT_WINDOW,
callingUid, callingPackage, /* featureId */ null, "");
if (mode == AppOpsManager.MODE_DEFAULT) {
@@ -6369,6 +6370,13 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
return new PackageConfigurationUpdaterImpl(Binder.getCallingPid());
}
}
@Override
public boolean hasSystemAlertWindowPermission(int callingUid, int callingPid,
String callingPackage) {
return ActivityTaskManagerService.this.hasSystemAlertWindowPermission(callingUid,
callingPid, callingPackage);
}
}
final class PackageConfigurationUpdaterImpl implements