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

Merge "Clear calling UID before resolving intent types." into pi-dev

Browse Source
This commit is contained in:
Bryce Lee
2018-03-16 18:04:00 +00:00
committed by Android (Google) Code Review
parent 6b4e6a17e9 cdb901b584
commit c16de0565b
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/ActivityManagerService.java
View File

@@ -25932,16 +25932,19 @@ public class ActivityManagerService extends IActivityManager.Stub
Bundle bOptions) {
Preconditions.checkNotNull(intents, "intents");
final String[] resolvedTypes = new String[intents.length];
for (int i = 0; i < intents.length; i++) {
resolvedTypes[i] = intents[i].resolveTypeIfNeeded(mContext.getContentResolver());
}
// UID of the package on user userId.
// "= 0" is needed because otherwise catch(RemoteException) would make it look like
// packageUid may not be initialized.
int packageUid = 0;
final long ident = Binder.clearCallingIdentity();
try {
for (int i = 0; i < intents.length; i++) {
resolvedTypes[i] =
intents[i].resolveTypeIfNeeded(mContext.getContentResolver());
}
packageUid = AppGlobals.getPackageManager().getPackageUid(
packageName, PackageManager.MATCH_DEBUG_TRIAGED_MISSING, userId);
} catch (RemoteException e) {