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

Merge "Fix realCallingUid/Pid for startActivities()" into nyc-mr1-dev

Browse Source
This commit is contained in:
Makoto Onuki
2016-07-22 02:49:11 +00:00
committed by Android (Google) Code Review
parent d50b5a9262 d67b187dcc
commit 8c5dce5636
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/core/java/com/android/server/am/ActivityStarter.java
View File

@@ -895,13 +895,15 @@ class ActivityStarter {
throw new IllegalArgumentException("intents are length different than resolvedTypes");
}
final int realCallingPid = Binder.getCallingPid();
final int realCallingUid = Binder.getCallingUid();
int callingPid;
if (callingUid >= 0) {
callingPid = -1;
} else if (caller == null) {
callingPid = Binder.getCallingPid();
callingUid = Binder.getCallingUid();
callingPid = realCallingPid;
callingUid = realCallingUid;
} else {
callingPid = callingUid = -1;
}
@@ -942,7 +944,8 @@ class ActivityStarter {
i == intents.length - 1 ? bOptions : null);
int res = startActivityLocked(caller, intent, null /*ephemeralIntent*/,
resolvedTypes[i], aInfo, null /*rInfo*/, null, null, resultTo, null, -1,
callingPid, callingUid, callingPackage, callingPid, callingUid, 0,
callingPid, callingUid, callingPackage,
realCallingPid, realCallingUid, 0,
options, false, componentSpecified, outActivity, null, null);
if (res < 0) {
return res;