commit f0864b1d95411ce9886a5ade13f42cb17f578828
author Tadashi G. Takaoka <takaoka@google.com> Thu Mar 14 03:41:00 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 14 03:41:01 2013 +0000
tree 2ccfe0c3ba089cdf674f793fd8f73315e8849ad6
parent 0d5f214aa774ab0ab7c17521984caae11c9f4c2b
parent 41e60bf6dd533d1641b64ebeecd3148dd396c370

Merge "Clean up StaticInnerHandlerWrapper a bit" into jb-mr2-dev

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)) {