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

DO NOT MERGE. KEY_INTENT shouldn't grant permissions.

Browse Source 
am: 04b96d76a9

Change-Id: Ie2ae7f5071a534e1245c92293014963c8e4187ca
This commit is contained in:
Jeff Sharkey
2017-10-11 20:32:40 +00:00
committed by android-build-merger
parent a4f6ca3e77 04b96d76a9
commit d20cad62ee
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2000,6 +2000,11 @@ public class AccountManagerService
Intent intent = result.getParcelable(AccountManager.KEY_INTENT); Intent intent = result.getParcelable(AccountManager.KEY_INTENT);
if (intent != null && notifyOnAuthFailure && !customTokens) { if (intent != null && notifyOnAuthFailure && !customTokens) {
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));
doNotification(mAccounts, doNotification(mAccounts,
account, result.getString(AccountManager.KEY_AUTH_FAILED_MESSAGE), account, result.getString(AccountManager.KEY_AUTH_FAILED_MESSAGE),
intent, accounts.userId); intent, accounts.userId);
@@ -3087,6 +3092,11 @@ public class AccountManagerService
} }
if (result != null if (result != null
&& (intent = result.getParcelable(AccountManager.KEY_INTENT)) != null) { && (intent = result.getParcelable(AccountManager.KEY_INTENT)) != null) {
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));
/* /*
* The Authenticator API allows third party authenticators to * The Authenticator API allows third party authenticators to
* supply arbitrary intents to other apps that they can run, * supply arbitrary intents to other apps that they can run,