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

Commit b95e5679 authored by liangweikang's avatar liangweikang Committed by android-build-merger
Browse files

Merge "fixed applyConfigurationToResourcesLocked WeakReference is null" am: 264d1f12 

am: 45562df8

Change-Id: Ibd3818f9b37ee58c6225a9b6d7cefd486f20bdb9
parents b8297084 45562df8

core/java/android/app/ResourcesManager.java

+4 −2
Original line number Diff line number Diff line
@@ -826,7 +826,8 @@ public class ResourcesManager { 


            for (int i = mResourceImpls.size() - 1; i >= 0; i--) {

                ResourcesKey key = mResourceImpls.keyAt(i);

                ResourcesImpl r = mResourceImpls.valueAt(i).get();

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

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

                if (r != null) {

                    if (DEBUG || DEBUG_CONFIGURATION) Slog.v(TAG, "Changing resources "

                            + r + " config to: " + config);
@@ -890,8 +891,9 @@ public class ResourcesManager { 


            final int implCount = mResourceImpls.size();

            for (int i = 0; i < implCount; i++) {

                final ResourcesImpl impl = mResourceImpls.valueAt(i).get();

                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 (!ArrayUtils.contains(key.mLibDirs, libAsset)) {

                        final int newLibAssetCount = 1 +