diff options
| author | Julia Reynolds <juliacr@google.com> | 2015-07-10 16:51:37 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-10 16:51:37 +0000 |
| commit | a368f9a97405b6358515186614cd9f450119f937 (patch) | |
| tree | 96963d9e15407e746368f5a700c45bdefdfe19ef | |
| parent | df778e8e76ca41c517385b8c30a468eecc37d107 (diff) | |
| parent | ddd887afc826b82b37ca8bd43c847479c94c07aa (diff) | |
| download | packages_apps_Settings-a368f9a97405b6358515186614cd9f450119f937.zip packages_apps_Settings-a368f9a97405b6358515186614cd9f450119f937.tar.gz packages_apps_Settings-a368f9a97405b6358515186614cd9f450119f937.tar.bz2 | |
am ddd887af: Prevent crash when removing an account.
* commit 'ddd887afc826b82b37ca8bd43c847479c94c07aa':
Prevent crash when removing an account.
| -rw-r--r-- | src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java | 3 |
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)); |