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

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

Copy resume callbacks list prior to making callbacks

am: a8971c14

Change-Id: I182892451b8268b0b6fed0983af7c15ae3174000
parents aca4f39f a8971c14
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();