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

Merge "Add a lock when unwrapping lazy value in bundles"

Browse Source
This commit is contained in:
Hani Kazmi
2022-09-14 12:05:26 +00:00
committed by Android (Google) Code Review
parent 7f4150929b 9da89484bd
commit 9cce3d7dd5
1 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
core/java/android/os/BaseBundle.java
View File

@@ -27,6 +27,7 @@ import android.util.MathUtils;
import android.util.Slog;
import android.util.SparseArray;
import com.android.internal.annotations.GuardedBy;
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.util.IndentingPrintWriter;
import com.android.internal.util.Preconditions;
@@ -395,6 +396,20 @@ public class BaseBundle {
@Nullable
final <T> T getValueAt(int i, @Nullable Class<T> clazz, @Nullable Class<?>... itemTypes) {
Object object = mMap.valueAt(i);
if (object instanceof BiFunction<?, ?, ?>) {
synchronized (this) {
object = unwrapLazyValueFromMapLocked(i, clazz, itemTypes);
}
}
return (clazz != null) ? clazz.cast(object) : (T) object;
}
@SuppressWarnings("unchecked")
@Nullable
@GuardedBy("this")
private Object unwrapLazyValueFromMapLocked(int i, @Nullable Class<?> clazz,
@Nullable Class<?>... itemTypes) {
Object object = mMap.valueAt(i);
if (object instanceof BiFunction<?, ?, ?>) {
try {
object = ((BiFunction<Class<?>, Class<?>[], ?>) object).apply(clazz, itemTypes);
@@ -409,7 +424,8 @@ public class BaseBundle {
mMap.setValueAt(i, object);
mLazyValues--;
if (mOwnsLazyValues) {
Preconditions.checkState(mLazyValues >= 0, "Lazy values ref count below 0");
Preconditions.checkState(mLazyValues >= 0,
"Lazy values ref count below 0");
// No more lazy values in mMap, so we can recycle the parcel early rather than
// waiting for the next GC run
if (mLazyValues == 0) {
@@ -420,7 +436,7 @@ public class BaseBundle {
}
}
}
return (clazz != null) ? clazz.cast(object) : (T) object;
return object;
}
private void initializeFromParcelLocked(@NonNull Parcel parcelledData, boolean ownsParcel,