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

Commit 094e5638 authored by Winson Chung's avatar Winson Chung Committed by Android (Google) Code Review
Browse files

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

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

        for (OnResumeCallback cb : mOnResumeCallbacks) {
            cb.onLauncherResume();
        }
        if (!mOnResumeCallbacks.isEmpty()) {
            final ArrayList<OnResumeCallback> resumeCallbacks = new ArrayList<>(mOnResumeCallbacks);
            mOnResumeCallbacks.clear();
            for (int i = resumeCallbacks.size() - 1; i >= 0; i--) {
                resumeCallbacks.get(i).onLauncherResume();
            }
            resumeCallbacks.clear();
        }

        if (mLauncherCallbacks != null) {
            mLauncherCallbacks.onResume();