From d3a32ed21b545d7639c52fe171c35a81276339c6 Mon Sep 17 00:00:00 2001 From: Doris Ling Date: Wed, 4 Jan 2017 13:51:38 -0800 Subject: [PATCH] Check for text type before setting text span. The text from the empty text view can be any CharSequence. Need to check the actual type before trying to cast it to Spannable and setting the text span. Change-Id: Ib3ead0a0fe0b797e026c0c259591025fc9c94709 Fix: 34075068 Test: make RunSettingsRoboTests --- .../settings/bluetooth/BluetoothSettings.java | 15 ++++++-- .../bluetooth/BluetoothSettingsTest.java | 37 +++++++++++++++++++ 2 files changed, 48 insertions(+), 4 deletions(-) create mode 100644 tests/robotests/src/com/android/settings/bluetooth/BluetoothSettingsTest.java diff --git a/src/com/android/settings/bluetooth/BluetoothSettings.java b/src/com/android/settings/bluetooth/BluetoothSettings.java index 2a1341ee7c7..d709726b6ee 100644 --- a/src/com/android/settings/bluetooth/BluetoothSettings.java +++ b/src/com/android/settings/bluetooth/BluetoothSettings.java @@ -428,10 +428,7 @@ public final class BluetoothSettings extends DeviceListPreferenceFragment implem }); } getPreferenceScreen().removeAll(); - Spannable boldSpan = (Spannable) emptyView.getText(); - boldSpan.setSpan( - new TextAppearanceSpan(getActivity(), android.R.style.TextAppearance_Medium), 0, - briefText.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); + setTextSpan(emptyView.getText(), briefText); } @Override @@ -461,6 +458,16 @@ public final class BluetoothSettings extends DeviceListPreferenceFragment implem updateContent(mLocalAdapter.getBluetoothState()); } + @VisibleForTesting + void setTextSpan(CharSequence text, CharSequence briefText) { + if (text instanceof Spannable) { + Spannable boldSpan = (Spannable) text; + boldSpan.setSpan( + new TextAppearanceSpan(getActivity(), android.R.style.TextAppearance_Medium), 0, + briefText.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); + } + } + private final View.OnClickListener mDeviceProfilesListener = new View.OnClickListener() { @Override public void onClick(View v) { diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSettingsTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSettingsTest.java new file mode 100644 index 00000000000..9e90fdf37a0 --- /dev/null +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSettingsTest.java @@ -0,0 +1,37 @@ +/* + * Copyright (C) 2017 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.settings.bluetooth; + +import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.TestConfig; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.robolectric.annotation.Config; + +@RunWith(SettingsRobolectricTestRunner.class) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +public class BluetoothSettingsTest { + + @Test + public void setTextSpan_notSpannable_shouldNotCrash() { + final String str = "test"; + final BluetoothSettings settings = new BluetoothSettings(); + settings.setTextSpan(str, "hello"); + } + +}