Merge "fix possible NPE in DebugSettings"

2013-01-10 03:00:24 -08:00 · 2013-01-10 03:00:24 -08:00 · 2ef0d3bf8d
parent d9c7a6b9b3 e8b4fd2644
commit 2ef0d3bf8d
1 changed files with 3 additions and 0 deletions
--- 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;