Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a08c6a1c authored Jul 28, 2016 by Makoto Onuki Committed by Kenny Guy Feb 23, 2017

DO NOT MERGE Relax isUserRunning check and allow in-profile calls

Bug 30475753
Bug 35667752

Change-Id: I739ee7e259f041f5e133edf048b6b54cb7a770db
(cherry picked from commit 8198deac)

parent 9aca8929

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

+3 −2

Original line number	Diff line number	Diff line
		@@ -21433,8 +21433,9 @@ public final class ActivityManagerService extends ActivityManagerNative

		@Override
		public boolean isUserRunning(int userId, int flags) {
		if (userId != UserHandle.getCallingUserId() && checkCallingPermission(
		INTERACT_ACROSS_USERS) != PackageManager.PERMISSION_GRANTED) {
		if (!mUserController.isSameProfileGroup(userId, UserHandle.getCallingUserId())
		&& checkCallingPermission(INTERACT_ACROSS_USERS)
		!= PackageManager.PERMISSION_GRANTED) {
		String msg = "Permission Denial: isUserRunning() from pid="
		+ Binder.getCallingPid()
		+ ", uid=" + Binder.getCallingUid()

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

+3 −0

Original line number	Diff line number	Diff line
		@@ -1453,6 +1453,9 @@ final class UserController {
		}

		boolean isSameProfileGroup(int callingUserId, int targetUserId) {
		if (callingUserId == targetUserId) {
		return true;
		}
		synchronized (mUserProfileGroupIdsSelfLocked) {
		int callingProfile = mUserProfileGroupIdsSelfLocked.get(callingUserId,
		UserInfo.NO_PROFILE_GROUP_ID);