aboutsummaryrefslogtreecommitdiffstats
path: root/java/src
diff options
context:
space:
mode:
authorsatok <satok@google.com>2013-01-10 03:00:24 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-01-10 03:00:24 -0800
commit2ef0d3bf8db57ebebcb1c10f5b378a36b33ba1eb (patch)
tree3ec6cc6ac7c0aa878e6978d95b317bf401d0cb8f /java/src
parentd9c7a6b9b32c52b773165f7e177b3511cdc21d2f (diff)
parente8b4fd264476c59dbfc997ce645f077e64d8f0c8 (diff)
downloadlatinime-2ef0d3bf8db57ebebcb1c10f5b378a36b33ba1eb.tar.gz
latinime-2ef0d3bf8db57ebebcb1c10f5b378a36b33ba1eb.tar.xz
latinime-2ef0d3bf8db57ebebcb1c10f5b378a36b33ba1eb.zip
Merge "fix possible NPE in DebugSettings"
Diffstat (limited to 'java/src')
-rw-r--r--java/src/com/android/inputmethod/latin/DebugSettings.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/java/src/com/android/inputmethod/latin/DebugSettings.java b/java/src/com/android/inputmethod/latin/DebugSettings.java
index d1792a369..9be87848f 100644
--- a/java/src/com/android/inputmethod/latin/DebugSettings.java
+++ b/java/src/com/android/inputmethod/latin/DebugSettings.java
@@ -107,6 +107,9 @@ public final class DebugSettings extends PreferenceFragment
String version = "";
try {
final Context context = getActivity();
+ if (context == null) {
+ return;
+ }
final String packageName = context.getPackageName();
PackageInfo info = context.getPackageManager().getPackageInfo(packageName, 0);
version = "Version " + info.versionName;