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

This commit is contained in:
TreeHugger Robot
2017-10-11 20:22:22 +00:00
committed by Android (Google) Code Review

View File

@@ -3860,6 +3860,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();