Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e28d80a8 authored by Steve Howard's avatar Steve Howard Committed by Android Git Automerger
Browse files

am d2de99e3: am 536ee090: Merge "Fix name shadowing bug with revoking URI... 

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

Merge commit 'd2de99e3'

* commit 'd2de99e3':
  Fix name shadowing bug with revoking URI permissions.
parents 4b4f6a36 d2de99e3

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

+3 −3
Original line number Diff line number Diff line
@@ -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) {