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

Commit 5c8908c9 authored by Varun Shah's avatar Varun Shah Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE in ContentProviderHelper." into main

parents 7ae419a9 615c6bd0

services/core/java/com/android/server/am/ContentProviderHelper.java

+3 −2
Original line number Diff line number Diff line
@@ -1975,9 +1975,10 @@ public class ContentProviderHelper { 
        return mProviderMap.dumpProviderProto(fd, pw, name, args);

    }



    private Boolean isAuthorityRedirectedForCloneProfileCached(String auth) {

    private boolean isAuthorityRedirectedForCloneProfileCached(String auth) {

        if (mCloneProfileAuthorityRedirectionCache.containsKey(auth)) {

            return mCloneProfileAuthorityRedirectionCache.get(auth);

            final Boolean retVal = mCloneProfileAuthorityRedirectionCache.get(auth);

            return retVal == null ? false : retVal.booleanValue();

        } else {

            boolean isAuthRedirected = isAuthorityRedirectedForCloneProfile(auth);

            mCloneProfileAuthorityRedirectionCache.put(auth, isAuthRedirected);