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

Commit 759b5b08 authored by Vinit Nayak's avatar Vinit Nayak Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: Ic759ccdd4fdd915e455e31948749580769c1009c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a3d8e5e5 a6e7a4b5

src/com/android/launcher3/util/MainThreadInitializedObject.java

+7 −4
Original line number Diff line number Diff line
@@ -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;