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

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

View File

@@ -3879,6 +3879,10 @@ public class AccountManagerService
protected void checkKeyIntent(
int authUid,
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();
try {
PackageManager pm = mContext.getPackageManager();