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 
am: f6fb21c

* commit 'f6fb21c44d1b138c28bdd057c7b83e35f62a432b':
  Fix crash adding an account.
This commit is contained in:
Julia Reynolds
2016-03-17 18:19:23 +00:00
committed by android-build-merger
parent 8dd1b68b6f f6fb21c44d
commit 1e148a3094
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) {
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));
}
}