From 8cedc7cae0ba3e8e880a08ca27afb351c3d0bced Mon Sep 17 00:00:00 2001
From: Julia Reynolds <juliacr@google.com>
Date: Thu, 17 Mar 2016 12:56:30 -0400
Subject: [PATCH] Fix crash adding an account.

Bug: 27709695
Change-Id: I66b69d71ed346e8d6f0d8493e6dd415d81f41ac1
---
 .../ConfirmDeviceCredentialBaseFragment.java        | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java b/src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java
index b9836d133cd..d48906e3cd5 100644
--- a/src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java
+++ b/src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java
@@ -137,17 +137,12 @@ public abstract class ConfirmDeviceCredentialBaseFragment extends InstrumentedFr
         if (intent != null) {
             CharSequence titleText = intent.getCharSequenceExtra(
                     ConfirmDeviceCredentialBaseFragment.TITLE_TEXT);
-            if (titleText == null && supplementalText == null) {
+            if (titleText == null || suplementalText == null) {
                 return;
             }
-            StringBuilder builder = new StringBuilder();
-            if (titleText != null) {
-                builder.append(titleText).append(",");
-            }
-            if (supplementalText != null) {
-                builder.append(supplementalText);
-            }
-            getActivity().setTitle(Utils.createAccessibleSequence(titleText, builder.toString()));
+            String accessibilityTitle =
+                    new StringBuilder(titleText).append(",").append(suplementalText).toString();
+            getActivity().setTitle(Utils.createAccessibleSequence(titleText, accessibilityTitle));
         }
     }