PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't throw exception for SafeCloseable objects" into udc-dev am: a6e7a4b574

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23247739

Change-Id: Ic759ccdd4fdd915e455e31948749580769c1009c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Vinit Nayak
2023-05-16 18:21:55 +00:00
committed by Automerger Merge Worker
parent a3d8e5e5b6 a6e7a4b574
commit 759b5b08f7
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/util/MainThreadInitializedObject.java
+7 -4
View File
@@ -136,16 +136,19 @@ public class MainThreadInitializedObject<T> {
if (mDestroyed) {
Log.e(TAG, "Static object access with a destroyed context");
}
if (!mAllowedObjects.contains(object)) {
throw new IllegalStateException(
"Leaking unknown objects " + object + " " + provider);
}
T t = (T) mObjectMap.get(object);
if (t != null) {
return t;
}
if (Looper.myLooper() == Looper.getMainLooper()) {
t = createObject(provider);
// Check if we've explicitly allowed the object or if it's a SafeCloseable,
// it will get destroyed in onDestroy()
if (!mAllowedObjects.contains(object) && !(t instanceof SafeCloseable)) {
throw new IllegalStateException(
"Leaking unknown objects " + object + " " + provider + " " + t);
}
mObjectMap.put(object, t);
mOrderedObjects.add(t);
return t;