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

Commit f2ccf486 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 8756258 from ed2e7719 to tm-release

Change-Id: Ie0597a75aa07d54a2e64e26f151b73fae4cd5a8d
parents 2719b172 ed2e7719
Loading
Loading
Loading
Loading
+3 −4
Original line number Diff line number Diff line
@@ -166,11 +166,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
                    if (mActivity != activity) {
                        return;
                    }
                    if (mTaskAnimationManager != null) {
                        mTaskAnimationManager.finishRunningRecentsAnimation(true);
                    }
                    mRecentsView = null;
                    mActivity.unregisterActivityLifecycleCallbacks(mLifecycleCallbacks);
                    mActivity = null;
                }
            };
@@ -1599,6 +1595,9 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,

    private void reset() {
        mStateCallback.setStateOnUiThread(STATE_HANDLER_INVALIDATED);
        if (mActivity != null) {
            mActivity.unregisterActivityLifecycleCallbacks(mLifecycleCallbacks);
        }
    }

    /**