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

Commit c836b63f authored by Varun Shah's avatar Varun Shah
Browse files

Fix NPEs in UriPermission. 

Change-Id: I246bf789246f626d6addc5626ba23524e73fbaa4
Fixes: 324350413
Test: builds/flashes
parent c8a73723

services/core/java/com/android/server/uri/UriPermission.java

+4 −2
Original line number Original line Diff line number Diff line
@@ -269,8 +269,9 @@ final class UriPermission { 
     * Remove given read owner, updating {@Link #modeFlags} as needed.

     * Remove given read owner, updating {@Link #modeFlags} as needed.

     */

     */

    void removeReadOwner(UriPermissionOwner owner) {

    void removeReadOwner(UriPermissionOwner owner) {

        if (!mReadOwners.remove(owner)) {

        if (mReadOwners == null || !mReadOwners.remove(owner)) {

            Slog.wtf(TAG, "Unknown read owner " + owner + " in " + this);

            Slog.wtf(TAG, "Unknown read owner " + owner + " in " + this);

            return;

        }

        }

        if (mReadOwners.size() == 0) {

        if (mReadOwners.size() == 0) {

            mReadOwners = null;

            mReadOwners = null;
@@ -294,8 +295,9 @@ final class UriPermission { 
     * Remove given write owner, updating {@Link #modeFlags} as needed.

     * Remove given write owner, updating {@Link #modeFlags} as needed.

     */

     */

    void removeWriteOwner(UriPermissionOwner owner) {

    void removeWriteOwner(UriPermissionOwner owner) {

        if (!mWriteOwners.remove(owner)) {

        if (mWriteOwners == null || !mWriteOwners.remove(owner)) {

            Slog.wtf(TAG, "Unknown write owner " + owner + " in " + this);

            Slog.wtf(TAG, "Unknown write owner " + owner + " in " + this);

            return;

        }

        }

        if (mWriteOwners.size() == 0) {

        if (mWriteOwners.size() == 0) {

            mWriteOwners = null;

            mWriteOwners = null;