summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java
diff options
context:
space:
mode:
authorJulia Reynolds <juliacr@google.com>2015-07-10 10:07:21 -0400
committerJulia Reynolds <juliacr@google.com>2015-07-10 10:07:21 -0400
commitddd887afc826b82b37ca8bd43c847479c94c07aa (patch)
tree59f39c199adf254397d4e9b440d59f1a0a472e41 /src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java
parent963e3fdd05156bb11e6692222b2d08b34c7d126b (diff)
downloadpackages_apps_Settings-ddd887afc826b82b37ca8bd43c847479c94c07aa.zip
packages_apps_Settings-ddd887afc826b82b37ca8bd43c847479c94c07aa.tar.gz
packages_apps_Settings-ddd887afc826b82b37ca8bd43c847479c94c07aa.tar.bz2
Prevent crash when removing an account.
Bug: 21164141 Change-Id: Ib7cee6d8478b49339fd3477e2369da15069f9c3f
Diffstat (limited to 'src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java')
-rw-r--r--src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java b/src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java
index 304c514..32ad317 100644
--- a/src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java
+++ b/src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java
@@ -88,6 +88,9 @@ public abstract class ConfirmDeviceCredentialBaseFragment extends InstrumentedFr
if (intent != null) {
CharSequence titleText = intent.getCharSequenceExtra(
ConfirmDeviceCredentialBaseFragment.TITLE_TEXT);
+ if (titleText == null || suplementalText == null) {
+ return;
+ }
String accessibilityTitle =
new StringBuilder(titleText).append(",").append(suplementalText).toString();
getActivity().setTitle(Utils.createAccessibleSequence(titleText, accessibilityTitle));