Commit 273eb091 authored Oct 26, 2018 by Varun Shah Committed by Atanas Kirilov Nov 07, 2018

RESTRICT AUTOMERGE: Added an app id security check in isAppForeground.

ActivityManagerService#isAppForeground now checks if the caller has the
permission to view if an app is in the foreground.

Bug: 115384617
Test: cts-tradefed run cts -m CtsSecurityTestCases -t android.security.cts.ActivityManagerTest#testIsAppInForegroundNormal
Test: cts-tradefed run cts -m CtsSecurityTestCases -t android.security.cts.ActivityManagerTest#testIsAppInForegroundMalicious
Change-Id: I9602c89b2d40036e525c38960a08326dc74c6682

parent 7098d462

services/core/java/com/android/server/am/ActivityManagerService.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -8781,6 +8781,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) {