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

Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev

Browse Source 
am: 254369967a

Change-Id: I511e6d122a5717b36ad78d8100ed728ef862adff
This commit is contained in:
Jeff Sharkey
2017-10-11 20:34:48 +00:00
committed by android-build-merger
parent 2399d935bc 254369967a
commit 4a60106aa0
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/accounts/AccountManagerService.java
View File

@@ -3879,6 +3879,10 @@ public class AccountManagerService
protected void checkKeyIntent( protected void checkKeyIntent(
int authUid, int authUid,
Intent intent) throws SecurityException { Intent intent) throws SecurityException {
intent.setFlags(intent.getFlags() & ~(Intent.FLAG_GRANT_READ_URI_PERMISSION
| Intent.FLAG_GRANT_WRITE_URI_PERMISSION
| Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION
| Intent.FLAG_GRANT_PREFIX_URI_PERMISSION));
long bid = Binder.clearCallingIdentity(); long bid = Binder.clearCallingIdentity();
try { try {
PackageManager pm = mContext.getPackageManager(); PackageManager pm = mContext.getPackageManager();