From 8cdc827f82dd6e37f5f07649638e77d73480ec07 Mon Sep 17 00:00:00 2001
From: Adrian Roos <roosa@google.com>
Date: Fri, 10 Mar 2023 10:19:57 +0000
Subject: [PATCH] InputMethodManagerServiceTestBase: make robust against setup
 failure

Fixes an issue where if setup fails, teardown will throw an NPE and
hide the real issue.

Bug: 272633154
Change-Id: I16f5c6d90720f3845a7da5229de3537c9a9dc668
Test: n/a
---
 .../server/inputmethod/InputMethodManagerServiceTestBase.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/services/tests/InputMethodSystemServerTests/src/com/android/server/inputmethod/InputMethodManagerServiceTestBase.java b/services/tests/InputMethodSystemServerTests/src/com/android/server/inputmethod/InputMethodManagerServiceTestBase.java
index 7cd55f326366c..9829e57c6ef85 100644
--- a/services/tests/InputMethodSystemServerTests/src/com/android/server/inputmethod/InputMethodManagerServiceTestBase.java
+++ b/services/tests/InputMethodSystemServerTests/src/com/android/server/inputmethod/InputMethodManagerServiceTestBase.java
@@ -240,7 +240,9 @@ public class InputMethodManagerServiceTestBase {
 
     @After
     public void tearDown() {
-        mInputMethodManagerService.mInputMethodDeviceConfigs.destroy();
+        if (mInputMethodManagerService != null) {
+            mInputMethodManagerService.mInputMethodDeviceConfigs.destroy();
+        }
 
         if (mServiceThread != null) {
             mServiceThread.quitSafely();