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

Commit 615c6bd0 authored by Varun Shah's avatar Varun Shah
Browse files

Fix NPE in ContentProviderHelper. 

Fixes: 296346003
Fixes: 296833947
Test: atest AppCloningHostTest
Change-Id: I47a00036dcf68e90edb2ddabbb64e7addf8fa874
parent 6d73a766

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