aboutsummaryrefslogtreecommitdiffstats
path: root/java/src
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2013-03-13 20:41:31 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-03-13 20:41:31 -0700
commit3153863f048031d9662c9848b43d60101e8bf708 (patch)
tree13c926aff7c6f8d314693e9c3deef8bfb726d856 /java/src
parent5a84bd1b22e169de12178d58b4dde35271cd092b (diff)
parent1ab33383f983082621084a65a168101e5fb526e0 (diff)
downloadlatinime-3153863f048031d9662c9848b43d60101e8bf708.tar.gz
latinime-3153863f048031d9662c9848b43d60101e8bf708.tar.xz
latinime-3153863f048031d9662c9848b43d60101e8bf708.zip
am 1ab33383: am 0d5f214a: Fix NPE found in monkey test
* commit '1ab33383f983082621084a65a168101e5fb526e0': Fix NPE found in monkey test
Diffstat (limited to 'java/src')
-rw-r--r--java/src/com/android/inputmethod/latin/setup/SetupActivity.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/java/src/com/android/inputmethod/latin/setup/SetupActivity.java b/java/src/com/android/inputmethod/latin/setup/SetupActivity.java
index e009fbc39..7f66c6d3e 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 @@ public final class SetupActivity extends Activity {
@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)) {