commit 9d3706046c3fc30d6f15a0fda4bae59a1a81ba12
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Oct 11 20:23:33 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Oct 11 20:23:33 2017 +0000
tree 9ea86adf4b5f09195f56560b94f9a27db20339e7
parent f32424b90d6a98eaedb4fd9953207ebb123f913a
parent a20eb2a4c624131c531508a6002adaf8b7e936db

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

services/core/java/com/android/server/accounts/AccountManagerService.java

diff --git a/services/core/java/com/android/server/accounts/AccountManagerService.java b/services/core/java/com/android/server/accounts/AccountManagerService.java
index a7a79cd..a085b71 100644
--- a/services/core/java/com/android/server/accounts/AccountManagerService.java
+++ b/services/core/java/com/android/server/accounts/AccountManagerService.java
@@ -4184,6 +4184,10 @@
         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();