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

Commit aca7bb4b authored by Hans Boehm's avatar Hans Boehm Committed by Automerger Merge Worker
Browse files

Merge "Prefer WeakReference.refersTo() to get()" am: 63e3c2c7 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1956816

Change-Id: I010f99e4de0cb60fecd6b6af38a17e695fc773e8
parents 145cbd8f 63e3c2c7

core/java/android/app/ActivityTransitionState.java

+1 −1
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ class ActivityTransitionState { 
        for (int i = mExitTransitionCoordinators.size() - 1; i >= 0; i--) {

            WeakReference<ExitTransitionCoordinator> oldRef

                    = mExitTransitionCoordinators.valueAt(i);

            if (oldRef.get() == null) {

            if (oldRef.refersTo(null)) {

                mExitTransitionCoordinators.removeAt(i);

            }

        }

core/java/android/app/ResourcesManager.java

+2 −3
Original line number Diff line number Diff line
@@ -678,8 +678,7 @@ public class ResourcesManager { 
        int refCount = mResourceImpls.size();

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

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

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

            if (resourceImpl == impl) {

            if (weakImplRef != null && weakImplRef.refersTo(resourceImpl)) {

                return mResourceImpls.keyAt(i);

            }

        }
@@ -1671,7 +1670,7 @@ public class ResourcesManager { 
                for (int i = mResourceImpls.size() - 1; i >= 0; i--) {

                    final ResourcesKey key = mResourceImpls.keyAt(i);

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

                    if (impl == null || impl.get() == null

                    if (impl == null || impl.refersTo(null)

                            || !ArrayUtils.contains(key.mLoaders, loader)) {

                        continue;

                    }

core/java/android/content/res/ColorStateList.java

+1 −1
Original line number Diff line number Diff line
@@ -198,7 +198,7 @@ public class ColorStateList extends ComplexColor implements Parcelable { 
            // Prune the cache before adding new items.

            final int N = sCache.size();

            for (int i = N - 1; i >= 0; i--) {

                if (sCache.valueAt(i).get() == null) {

                if (sCache.valueAt(i).refersTo(null)) {

                    sCache.removeAt(i);

                }

            }

core/java/android/content/res/Resources.java

+1 −1
Original line number Diff line number Diff line
@@ -2011,7 +2011,7 @@ public class Resources { 


            // Clean up references to garbage collected themes

            if (mThemeRefs.size() > mThemeRefsNextFlushSize) {

                mThemeRefs.removeIf(ref -> ref.get() == null);

                mThemeRefs.removeIf(ref -> ref.refersTo(null));

                mThemeRefsNextFlushSize = Math.max(MIN_THEME_REFS_FLUSH_SIZE,

                        2 * mThemeRefs.size());

            }

core/java/android/content/res/loader/ResourcesLoader.java

+1 −1
Original line number Diff line number Diff line
@@ -257,7 +257,7 @@ public class ResourcesLoader { 


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

            final WeakReference<Object> key = mChangeCallbacks.keyAt(i);

            if (key.get() == null) {

            if (key.refersTo(null)) {

                mChangeCallbacks.removeAt(i);

            } else {

                uniqueCallbacks.add(mChangeCallbacks.valueAt(i));