Merge "Fixes NPE in test" into main

1 files changed, 3 insertions, 1 deletions

diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/KeyguardIndicationControllerBaseTest.java b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/KeyguardIndicationControllerBaseTest.java
index 33a08035a7b2..1938f429264b 100644
--- a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/KeyguardIndicationControllerBaseTest.java
+++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/KeyguardIndicationControllerBaseTest.java
@@ -264,7 +264,9 @@ public class KeyguardIndicationControllerBaseTest extends SysuiTestCase {
 
     @After
     public void tearDown() throws Exception {
-        mTextView.setAnimationsEnabled(true);
+        if (mTextView != null) {
+            mTextView.setAnimationsEnabled(true);
+        }
         if (mController != null) {
             mController.destroy();
             mController = null;