am 33c7520b: am 0b1ec016: am 19d79659: Merge "Fix issue #11374840: adb shell... (b251e079) · Commits · e / os / android_frameworks_base

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

+0 −10

Original line number	Diff line number	Diff line
		@@ -12372,7 +12372,6 @@ public final class ActivityManagerService extends ActivityManagerNative
		synchronized(this) {
		final int callingPid = Binder.getCallingPid();
		final int callingUid = Binder.getCallingUid();
		checkValidCaller(callingUid, userId);
		final long origId = Binder.clearCallingIdentity();
		ComponentName res = mServices.startServiceLocked(caller, service,
		resolvedType, callingPid, callingUid, userId);
		@@ -12402,8 +12401,6 @@ public final class ActivityManagerService extends ActivityManagerNative
		throw new IllegalArgumentException("File descriptors passed in Intent");
		}

		checkValidCaller(Binder.getCallingUid(), userId);

		synchronized(this) {
		return mServices.stopServiceLocked(caller, service, resolvedType, userId);
		}
		@@ -16391,13 +16388,6 @@ public final class ActivityManagerService extends ActivityManagerNative
		return mUserManager;
		}

		private void checkValidCaller(int uid, int userId) {
		if (UserHandle.getUserId(uid) == userId \|\| uid == Process.SYSTEM_UID \|\| uid == 0) return;

		throw new SecurityException("Caller uid=" + uid
		+ " is not privileged to communicate with user=" + userId);
		}

		private int applyUserId(int uid, int userId) {
		return UserHandle.getUid(userId, uid);
		}