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

Commit 24fbe81e authored by Winson Chung's avatar Winson Chung Committed by android-build-merger
Browse files

Merge "Copy resume callbacks list prior to making callbacks" into ub-launcher3-qt-dev 

am: 094e5638

Change-Id: Ia3e9088f6341ebc37fd1286e12191cdd8776c64f
parents ddf64806 094e5638

src/com/android/launcher3/Launcher.java

+7 −3
Original line number Original line Diff line number Diff line
@@ -952,10 +952,14 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns, 
        mHandler.removeCallbacks(mHandleDeferredResume);

        mHandler.removeCallbacks(mHandleDeferredResume);

        Utilities.postAsyncCallback(mHandler, mHandleDeferredResume);

        Utilities.postAsyncCallback(mHandler, mHandleDeferredResume);





        for (OnResumeCallback cb : mOnResumeCallbacks) {

        if (!mOnResumeCallbacks.isEmpty()) {

            cb.onLauncherResume();

            final ArrayList<OnResumeCallback> resumeCallbacks = new ArrayList<>(mOnResumeCallbacks);

        }

            mOnResumeCallbacks.clear();

            mOnResumeCallbacks.clear();

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

                resumeCallbacks.get(i).onLauncherResume();

            }

            resumeCallbacks.clear();

        }





        if (mLauncherCallbacks != null) {

        if (mLauncherCallbacks != null) {

            mLauncherCallbacks.onResume();

            mLauncherCallbacks.onResume();