Merge "DO NOT MERGE: Cherry-pick 2ed5249 to JB." into jb-dev

Author: Dianne Hackborn

services/java/com/android/server/am/UriPermission.java

@@ -59,11 +59,11 @@ void clearModes(int modeFlagsToClear) {
         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();
             }
         }
     }