commit 821a0729ad4060b54a8311c957534117b84bc881
author Fabrice Di Meglio <fdimeglio@google.com> Tue Apr 08 13:56:06 2014 -0700
committer Fabrice Di Meglio <fdimeglio@google.com> Tue Apr 08 13:56:06 2014 -0700
tree 92cd561bcdb284b4c96e5e26ee3c52a60b2370c2
parent e5687b1b32e5c179ce42981119012cc918afa75a

Fix bug #13883976 Settings crash on long-tapping and swiping in Language & Input screen

- fix potential NPE

Change-Id: I12045f420d5b2a4f349e59a04141153cd2e46378

src/com/android/settings/SettingsActivity.java

diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 1c4326a..5470e11 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -740,8 +740,11 @@
         String title;
         if (titleRes > 0) {
             title = getString(titleRes);
-        } else {
+        } else if (titleText != null) {
             title = titleText.toString();
+        } else {
+            // There not much we can do in that case
+            title = "";
         }
         startWithFragment(fragmentClass, args, resultTo, resultRequestCode, title);
     }