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

Commit 536ee090 authored by Steve Howard's avatar Steve Howard Committed by Android (Google) Code Review
Browse files

Merge "Fix name shadowing bug with revoking URI permissions." into gingerbread

parents 5bade703 0de8ddb0

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) {