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

am 029675e5: Merge "Fix launching activity from a pending intent" into jb-mr1-dev

Browse Source 
* commit '029675e5ad8737a8a097c17d216afb3f11f0b12c':
  Fix launching activity from a pending intent
This commit is contained in:
Amith Yamasani
2012-08-17 15:56:21 -07:00
committed by Android Git Automerger
parent 5dd7b11eb2 029675e5ad
commit f4dbcb6459
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2539,7 +2539,6 @@ public final class ActivityManagerService extends ActivityManagerNative
// This is so super not safe, that only the system (or okay root) // This is so super not safe, that only the system (or okay root)
// can do it. // can do it.
int userId = Binder.getOrigCallingUser();
final int callingUid = Binder.getCallingUid(); final int callingUid = Binder.getCallingUid();
if (callingUid != 0 && callingUid != Process.myUid()) { if (callingUid != 0 && callingUid != Process.myUid()) {
throw new SecurityException( throw new SecurityException(
@@ -2548,7 +2547,7 @@ public final class ActivityManagerService extends ActivityManagerNative
int ret = mMainStack.startActivityMayWait(null, uid, intent, resolvedType, int ret = mMainStack.startActivityMayWait(null, uid, intent, resolvedType,
resultTo, resultWho, requestCode, startFlags, resultTo, resultWho, requestCode, startFlags,
null, null, null, null, options, userId); null, null, null, null, options, UserHandle.getUserId(uid));
return ret; return ret;
} }