summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--services/tests/InputMethodSystemServerTests/src/com/android/server/inputmethod/InputMethodManagerServiceTestBase.java4
1 files changed, 3 insertions, 1 deletions
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 7cd55f326366..9829e57c6ef8 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();