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

Commit c384d4eb authored by Beverly Tai's avatar Beverly Tai Committed by Android (Google) Code Review
Browse files

Merge "Add null-check for test variables in tearDown (@After)" into main

parents bf18a51e f1d3ae09

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/phone/KeyguardIndicationTextViewTest.java

+3 −1
Original line number Diff line number Diff line
@@ -46,8 +46,10 @@ public class KeyguardIndicationTextViewTest extends SysuiTestCase { 


    @After

    public void tearDown() {

        if (mKeyguardIndicationTextView != null) {

            mKeyguardIndicationTextView.setAnimationsEnabled(true);

        }

    }



    @Test

    public void switchIndication_null_hideIndication() {

packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/KeyguardClockPositionAlgorithmTest.java

+5 −1
Original line number Diff line number Diff line
@@ -82,9 +82,13 @@ public class KeyguardClockPositionAlgorithmTest extends SysuiTestCase { 


    @After

    public void tearDown() {



        if (mStaticMockSession != null) {

            mStaticMockSession.finishMocking();

        }



    }



    @Test

    public void notifPositionTopOfScreenOnAOD() {

        // GIVEN on AOD and clock has 0 height