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

Commit 7e520513 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE when adding WebView to ResourcesManager" into oc-dev

parents 36de3764 cd7197dd

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