diff options
| author | Tony Mantler <nicoya@google.com> | 2016-08-22 15:21:32 -0700 |
|---|---|---|
| committer | Tony Mantler <nicoya@google.com> | 2017-01-09 21:46:56 +0000 |
| commit | 605bb43374487cea465242337662fd97918a2d10 (patch) | |
| tree | 24c291e8087ffdcc66648bf57bd7a6f6c11470d1 | |
| parent | 36cf84ddb1a7c3835a0e06d2d61e383bf2d8ccc0 (diff) | |
| download | TvSettings-605bb43374487cea465242337662fd97918a2d10.tar.gz | |
Allow for a null list of BT devices
b/31015775
Change-Id: I4d2bdde69ef454bd65a2ea8b20ded4fe219eab15
(cherry picked from commit 64d9a084e49360976d3a73ab1a17d7dbaaee375c)
| -rw-r--r-- | Settings/src/com/android/tv/settings/accessories/AddAccessoryPreferenceFragment.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Settings/src/com/android/tv/settings/accessories/AddAccessoryPreferenceFragment.java b/Settings/src/com/android/tv/settings/accessories/AddAccessoryPreferenceFragment.java index dac821d04..229bcfe9b 100644 --- a/Settings/src/com/android/tv/settings/accessories/AddAccessoryPreferenceFragment.java +++ b/Settings/src/com/android/tv/settings/accessories/AddAccessoryPreferenceFragment.java @@ -60,6 +60,10 @@ public class AddAccessoryPreferenceFragment extends BaseLeanbackPreferenceFragme screen.removeAll(); } + if (devices == null) { + return; + } + // Add entries for the discovered Bluetooth devices for (BluetoothDevice bt : devices) { final Preference preference = new Preference(themedContext); |