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

Merge "Clear calling uid before changing whitelist" into oc-dev

Browse Source 
am: 97e3db9aee

Change-Id: Icc858733afb22720a9adf1a1c4e85ba47cf03e2d
This commit is contained in:
Amith Yamasani
2017-05-02 17:29:39 +00:00
committed by android-build-merger
parent 86c8ba41f3 97e3db9aee
commit d74a51bd62
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
services/core/java/com/android/server/am/PendingIntentRecord.java
View File

@@ -271,10 +271,15 @@ final class PendingIntentRecord extends IIntentSender.Stub {
resolvedType = key.requestResolvedType;
}
final int callingUid = Binder.getCallingUid();
final int callingPid = Binder.getCallingPid();
final long origId = Binder.clearCallingIdentity();
if (whitelistDuration > 0) {
StringBuilder tag = new StringBuilder(64);
tag.append("pendingintent:");
UserHandle.formatUid(tag, Binder.getCallingUid());
UserHandle.formatUid(tag, callingUid);
tag.append(":");
if (finalIntent.getAction() != null) {
tag.append(finalIntent.getAction());
@@ -283,12 +288,10 @@ final class PendingIntentRecord extends IIntentSender.Stub {
} else if (finalIntent.getData() != null) {
tag.append(finalIntent.getData());
}
owner.tempWhitelistForPendingIntentLocked(Binder.getCallingPid(),
Binder.getCallingUid(), uid, whitelistDuration, tag.toString());
owner.tempWhitelistForPendingIntentLocked(callingPid,
callingUid, uid, whitelistDuration, tag.toString());
}
final long origId = Binder.clearCallingIdentity();
boolean sendFinish = finishedReceiver != null;
int userId = key.userId;
if (userId == UserHandle.USER_CURRENT) {