From ac5f998396d6a3f1fa5bab131eb170e0fbcb375c Mon Sep 17 00:00:00 2001 From: Vairavan Srinivasan Date: Tue, 22 May 2012 00:06:15 -0700 Subject: [PATCH] DO NOT MERGE: Cherry-pick 2ed524966d3c4bd04ea5f54026ed59558d73cd44 to JB. This was contributed from AOSP, a fix to the management of URI write permissions. This is a very blatant bug, and with the new Intent ClipData and other stuff we are making much more use of write permissions in JB, so it is well worth taking. Change-Id: I58c86119b4d5c13fefd090944bea139803df1a48 --- services/java/com/android/server/am/UriPermission.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/java/com/android/server/am/UriPermission.java b/services/java/com/android/server/am/UriPermission.java index e3347cb753ac9..c5b1c7ba0e991 100644 --- a/services/java/com/android/server/am/UriPermission.java +++ b/services/java/com/android/server/am/UriPermission.java @@ -59,11 +59,11 @@ class UriPermission { if ((modeFlagsToClear&Intent.FLAG_GRANT_WRITE_URI_PERMISSION) != 0) { globalModeFlags &= ~Intent.FLAG_GRANT_WRITE_URI_PERMISSION; modeFlags &= ~Intent.FLAG_GRANT_WRITE_URI_PERMISSION; - if (readOwners.size() > 0) { + if (writeOwners.size() > 0) { for (UriPermissionOwner r : writeOwners) { r.removeWritePermission(this); } - readOwners.clear(); + writeOwners.clear(); } } }