From ddd887afc826b82b37ca8bd43c847479c94c07aa Mon Sep 17 00:00:00 2001
From: Julia Reynolds <juliacr@google.com>
Date: Fri, 10 Jul 2015 10:07:21 -0400
Subject: [PATCH] Prevent crash when removing an account.

Bug: 21164141
Change-Id: Ib7cee6d8478b49339fd3477e2369da15069f9c3f
---
 .../android/settings/ConfirmDeviceCredentialBaseFragment.java  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java b/src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java
index 304c514565f..32ad317e367 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));