Merge "Added an app id security check in isAppForeground."

2018-10-31 20:36:47 +00:00
parent 173fdc4d3f 5cf9f41ed6
commit cf0d1807cd
1 changed files with 8 additions and 0 deletions
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -5138,6 +5138,14 @@ public class ActivityManagerService extends IActivityManager.Stub

    @Override
    public boolean isAppForeground(int uid) {
+        int callerUid = Binder.getCallingUid();
+        if (UserHandle.isCore(callerUid) || callerUid == uid) {
+            return isAppForegroundInternal(uid);
+        }
+        return false;
+    }
+
+    private boolean isAppForegroundInternal(int uid) {
        synchronized (this) {
            UidRecord uidRec = mActiveUids.get(uid);
            if (uidRec == null || uidRec.idle) {