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

Commit fd50da4e authored by Adam Lesinski's avatar Adam Lesinski Committed by android-build-merger
Browse files

Merge "Fix NPE when adding WebView to ResourcesManager" into oc-dev am: 7e520513 

am: 9f887687

Change-Id: I00ed32ed5b01689ff536050e5a961e551bc9eac3
parents 2e98076c 9f887687

core/java/android/app/ResourcesManager.java

+1 −1
Original line number Diff line number Diff line
@@ -945,7 +945,7 @@ public class ResourcesManager { 
                final ResourcesKey key = mResourceImpls.keyAt(i);

                final WeakReference<ResourcesImpl> weakImplRef = mResourceImpls.valueAt(i);

                final ResourcesImpl impl = weakImplRef != null ? weakImplRef.get() : null;

                if (impl != null && key.mResDir.equals(assetPath)) {

                if (impl != null && Objects.equals(key.mResDir, assetPath)) {

                    if (!ArrayUtils.contains(key.mLibDirs, libAsset)) {

                        final int newLibAssetCount = 1 +

                                (key.mLibDirs != null ? key.mLibDirs.length : 0);