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

Commit 81c831df authored by Beverly Tai's avatar Beverly Tai Committed by Automerger Merge Worker
Browse files

Merge "Cleanup KeyguardIndicationController on tearDown" into tm-dev am: 4631f1ad 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17053989

Change-Id: Ia546bc5b3f1f628f624e585607a0350a73174a2e
parents c5986aba 4631f1ad

packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java

+8 −0
Original line number Diff line number Diff line
@@ -293,6 +293,14 @@ public class KeyguardIndicationController { 
        }

    }



    /**

     * Cleanup

     */

    public void destroy() {

        mHandler.removeCallbacksAndMessages(null);

        mBroadcastDispatcher.unregisterReceiver(mBroadcastReceiver);

    }



    private void handleAlignStateChanged(int alignState) {

        String alignmentIndication = "";

        if (alignState == DockManager.ALIGN_STATE_POOR) {

packages/SystemUI/tests/src/com/android/systemui/statusbar/KeyguardIndicationControllerTest.java

+4 −0
Original line number Diff line number Diff line
@@ -226,6 +226,10 @@ public class KeyguardIndicationControllerTest extends SysuiTestCase { 
    @After

    public void tearDown() throws Exception {

        mTextView.setAnimationsEnabled(true);

        if (mController != null) {

            mController.destroy();

            mController = null;

        }

    }



    private void createController() {