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

Commit e0e54600 authored by Orhan Uysal's avatar Orhan Uysal
Browse files

Revert "Fix activity leak" 

This reverts commit 67c807a1.

Reason for revert: <Setting the SplitSelectStateController to null causes NPE in launcher>

Fix: 342553715
Bug: 332339792
Change-Id: I10433e468948c4ba826e79baa06925fdf7dfbe5d
parent 67c807a1

quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java

+1 −3
Original line number Original line Diff line number Diff line
@@ -533,18 +533,16 @@ public class QuickstepLauncher extends Launcher implements RecentsViewContainer 
        if (mDesktopVisibilityController != null) {

        if (mDesktopVisibilityController != null) {

            mDesktopVisibilityController.unregisterSystemUiListener();

            mDesktopVisibilityController.unregisterSystemUiListener();

        }

        }

        mDesktopVisibilityController = null;





        if (mSplitSelectStateController != null) {

        if (mSplitSelectStateController != null) {

            removeBackAnimationCallback(mSplitSelectStateController.getSplitBackHandler());

            mSplitSelectStateController.onDestroy();

            mSplitSelectStateController.onDestroy();

        }

        }

        mSplitSelectStateController = null;





        super.onDestroy();

        super.onDestroy();

        mHotseatPredictionController.destroy();

        mHotseatPredictionController.destroy();

        mSplitWithKeyboardShortcutController.onDestroy();

        mSplitWithKeyboardShortcutController.onDestroy();

        if (mViewCapture != null) mViewCapture.close();

        if (mViewCapture != null) mViewCapture.close();

        removeBackAnimationCallback(mSplitSelectStateController.getSplitBackHandler());

    }

    }





    @Override

    @Override