diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-11-19 22:50:20 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-11-19 22:50:20 +0000 |
| commit | c0175af95468837ca2a172439d36ed52bd53a967 (patch) | |
| tree | c2237b77b2aa33c45e6846246ffd2dd1e7bff00c | |
| parent | 94a49c90a70cadd73abad456b1fd44407ff869d8 (diff) | |
| parent | 273eb0918adbc7cd410a583b0d25c518b9b1e35e (diff) | |
| download | base-c0175af95468837ca2a172439d36ed52bd53a967.tar.gz | |
Merge "RESTRICT AUTOMERGE: Added an app id security check in isAppForeground." into pi-dev
| -rw-r--r-- | services/core/java/com/android/server/am/ActivityManagerService.java | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index 10707b255c29..a1d42c091334 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -8768,6 +8768,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) { |