diff options
author | Steve Howard <showard@google.com> | 2010-09-14 16:29:26 -0700 |
---|---|---|
committer | Steve Howard <showard@google.com> | 2010-09-14 16:29:26 -0700 |
commit | 0de8ddb0cfd65968387b51fb0d4f505b81d8b0a2 (patch) | |
tree | cb535dfbbe723e987c262639fac407bc7f32f470 /services/java/com/android/server/am/UriPermission.java | |
parent | bd2e9ec64d9a292a1309504c6c5fe33e1bc2333a (diff) | |
download | frameworks_base-0de8ddb0cfd65968387b51fb0d4f505b81d8b0a2.zip frameworks_base-0de8ddb0cfd65968387b51fb0d4f505b81d8b0a2.tar.gz frameworks_base-0de8ddb0cfd65968387b51fb0d4f505b81d8b0a2.tar.bz2 |
Fix name shadowing bug with revoking URI permissions.
Change-Id: Ibfcb0dc73c6b1a111dbb8d56e6f0b78084f5e4e6
Diffstat (limited to 'services/java/com/android/server/am/UriPermission.java')
-rw-r--r-- | services/java/com/android/server/am/UriPermission.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/services/java/com/android/server/am/UriPermission.java b/services/java/com/android/server/am/UriPermission.java index c95546e..0cb6943 100644 --- a/services/java/com/android/server/am/UriPermission.java +++ b/services/java/com/android/server/am/UriPermission.java @@ -45,8 +45,8 @@ class UriPermission { uri = _uri; } - void clearModes(int modeFlags) { - if ((modeFlags&Intent.FLAG_GRANT_READ_URI_PERMISSION) != 0) { + void clearModes(int modeFlagsToClear) { + if ((modeFlagsToClear&Intent.FLAG_GRANT_READ_URI_PERMISSION) != 0) { globalModeFlags &= ~Intent.FLAG_GRANT_READ_URI_PERMISSION; modeFlags &= ~Intent.FLAG_GRANT_READ_URI_PERMISSION; if (readOwners.size() > 0) { @@ -56,7 +56,7 @@ class UriPermission { readOwners.clear(); } } - if ((modeFlags&Intent.FLAG_GRANT_WRITE_URI_PERMISSION) != 0) { + 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) { |