Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 19d79659: Merge "Fix issue #11374840: adb shell am startservice not working any more" into klp-dev

Browse Source 
* commit '19d79659ee4c0e85775422ccbed3fa14c82fa66b':
  Fix issue #11374840: adb shell am startservice not working any more
This commit is contained in:
Dianne Hackborn
2013-10-25 15:32:21 -07:00
committed by Android Git Automerger
parent ba111ef9b5 19d79659ee
commit 0b1ec0165a
1 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/java/com/android/server/am/ActivityManagerService.java
View File

@@ -12367,7 +12367,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);
@@ -12397,8 +12396,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);
}
@@ -16389,13 +16386,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);
}