commit 1ab33383f983082621084a65a168101e5fb526e0
author Tadashi G. Takaoka <takaoka@google.com> Thu Mar 14 03:39:38 2013 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Mar 14 03:39:38 2013 +0000
tree 7f5e771f5af7fd9a1f5a01b61f147a61d51ba31d
parent 3f46e8a887a0ff6c59642d3ff68791a07574ea5c
parent 0d5f214aa774ab0ab7c17521984caae11c9f4c2b

am 0d5f214a: Fix NPE found in monkey test

* commit '0d5f214aa774ab0ab7c17521984caae11c9f4c2b':
  Fix NPE found in monkey test

java/src/com/android/inputmethod/latin/setup/SetupActivity.java

diff --git a/java/src/com/android/inputmethod/latin/setup/SetupActivity.java b/java/src/com/android/inputmethod/latin/setup/SetupActivity.java
index e009fbc..7f66c6d 100644
--- a/java/src/com/android/inputmethod/latin/setup/SetupActivity.java
+++ b/java/src/com/android/inputmethod/latin/setup/SetupActivity.java
@@ -62,6 +62,9 @@
         @Override
         public void handleMessage(final Message msg) {
             final SetupActivity setupActivity = getOuterInstance();
+            if (setupActivity == null) {
+                return;
+            }
             switch (msg.what) {
             case MSG_POLLING_IME_SETTINGS:
                 if (SetupActivity.isThisImeEnabled(setupActivity)) {