Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Prefer WeakReference.refersTo() to get()" am: 63e3c2c709 am: aca7bb4b9f am: a2e1dc8b9a am: db7bb39fb9

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

Change-Id: I8f190ce1b3c9fc97a4efd8f3d90178db6ab362da
This commit is contained in:
Hans Boehm
2022-01-27 01:18:15 +00:00
committed by Automerger Merge Worker
parent 3489df489c db7bb39fb9
commit 1350cb73d7
7 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/app/ActivityTransitionState.java
View File

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

5
core/java/android/app/ResourcesManager.java
View File

@@ -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;
}

2
core/java/android/content/res/ColorStateList.java
View File

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

2
core/java/android/content/res/Resources.java
View File

@@ -2080,7 +2080,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());
}

2
core/java/android/content/res/loader/ResourcesLoader.java
View File

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

6
core/java/android/os/BinderProxy.java
View File

@@ -125,7 +125,7 @@ public final class BinderProxy implements IBinder {
for (ArrayList<WeakReference<BinderProxy>> a : mMainIndexValues) {
if (a != null) {
for (WeakReference<BinderProxy> ref : a) {
if (ref.get() != null) {
if (!ref.refersTo(null)) {
++size;
}
}
@@ -196,7 +196,7 @@ public final class BinderProxy implements IBinder {
// This ensures that ArrayList size is bounded by the maximum occupancy of
// that bucket.
for (int i = 0; i < size; ++i) {
if (valueArray.get(i).get() == null) {
if (valueArray.get(i).refersTo(null)) {
valueArray.set(i, newWr);
Long[] keyArray = mMainIndexKeys[myHash];
keyArray[i] = key;
@@ -204,7 +204,7 @@ public final class BinderProxy implements IBinder {
// "Randomly" check one of the remaining entries in [i+1, size), so that
// needlessly long buckets are eventually pruned.
int rnd = Math.floorMod(++mRandom, size - (i + 1));
if (valueArray.get(i + 1 + rnd).get() == null) {
if (valueArray.get(i + 1 + rnd).refersTo(null)) {
remove(myHash, i + 1 + rnd);
}
}

2
core/java/android/text/method/TextKeyListener.java
View File

@@ -306,7 +306,7 @@ public class TextKeyListener extends BaseKeyListener implements SpanWatcher {
/* package */ int getPrefs(Context context) {
synchronized (this) {
if (!mPrefsInited || mResolver.get() == null) {
if (!mPrefsInited || mResolver.refersTo(null)) {
initPrefs(context);
}
}