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

am 536ee090: Merge "Fix name shadowing bug with revoking URI permissions." into gingerbread

Browse Source 
Merge commit '536ee090ef75add0f7244c1c22be83fe03a66010' into gingerbread-plus-aosp

* commit '536ee090ef75add0f7244c1c22be83fe03a66010':
  Fix name shadowing bug with revoking URI permissions.
This commit is contained in:
Steve Howard
2010-09-14 17:48:30 -07:00
committed by Android Git Automerger
parent c5e2e26b9d 536ee090ef
commit d2de99e377
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/java/com/android/server/am/UriPermission.java
View File

@@ -45,8 +45,8 @@ class UriPermission {
uri = _uri; uri = _uri;
} }
void clearModes(int modeFlags) { void clearModes(int modeFlagsToClear) {
if ((modeFlags&Intent.FLAG_GRANT_READ_URI_PERMISSION) != 0) { if ((modeFlagsToClear&Intent.FLAG_GRANT_READ_URI_PERMISSION) != 0) {
globalModeFlags &= ~Intent.FLAG_GRANT_READ_URI_PERMISSION; globalModeFlags &= ~Intent.FLAG_GRANT_READ_URI_PERMISSION;
modeFlags &= ~Intent.FLAG_GRANT_READ_URI_PERMISSION; modeFlags &= ~Intent.FLAG_GRANT_READ_URI_PERMISSION;
if (readOwners.size() > 0) { if (readOwners.size() > 0) {
@@ -56,7 +56,7 @@ class UriPermission {
readOwners.clear(); 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; globalModeFlags &= ~Intent.FLAG_GRANT_WRITE_URI_PERMISSION;
modeFlags &= ~Intent.FLAG_GRANT_WRITE_URI_PERMISSION; modeFlags &= ~Intent.FLAG_GRANT_WRITE_URI_PERMISSION;
if (readOwners.size() > 0) { if (readOwners.size() > 0) {