PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix crash adding an account." into nyc-dev

Browse Source
This commit is contained in:
Julia Reynolds
2016-03-17 17:30:17 +00:00
committed by Android (Google) Code Review
parent e580f94079 8cedc7cae0
commit f6fb21c44d
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java
View File

@@ -137,17 +137,12 @@ public abstract class ConfirmDeviceCredentialBaseFragment extends InstrumentedFr
if (intent != null) { if (intent != null) {
CharSequence titleText = intent.getCharSequenceExtra( CharSequence titleText = intent.getCharSequenceExtra(
ConfirmDeviceCredentialBaseFragment.TITLE_TEXT); ConfirmDeviceCredentialBaseFragment.TITLE_TEXT);
if (titleText == null && supplementalText == null) { if (titleText == null || suplementalText == null) {
return; return;
} }
StringBuilder builder = new StringBuilder(); String accessibilityTitle =
if (titleText != null) { new StringBuilder(titleText).append(",").append(suplementalText).toString();
builder.append(titleText).append(","); getActivity().setTitle(Utils.createAccessibleSequence(titleText, accessibilityTitle));
}
if (supplementalText != null) {
builder.append(supplementalText);
}
getActivity().setTitle(Utils.createAccessibleSequence(titleText, builder.toString()));
} }
} }