commit c94d37e18091be7839a14891a118b24d33566f48
author Cole Faust <colefaust@google.com> Mon Dec 23 15:30:57 2019 -0800
committer Cole Faust <colefaust@google.com> Mon Dec 23 15:30:57 2019 -0800
tree 6f91327b4d23645ea2338d80ebc6bbf7ec3653ef
parent 051c06b63bd24e6cee5cad3dadea622c0a87cde7

Fix ListPreference crash when the preference has no value

Fixes: 146802726
Test: Manually
Change-Id: I54ab5e3f36d1ee54b03c389bcc8d5016a12b01ca

car-ui-lib/src/com/android/car/ui/preference/ListPreferenceFragment.java

diff --git a/car-ui-lib/src/com/android/car/ui/preference/ListPreferenceFragment.java b/car-ui-lib/src/com/android/car/ui/preference/ListPreferenceFragment.java
index f8ff7c7..a213a11 100644
--- a/car-ui-lib/src/com/android/car/ui/preference/ListPreferenceFragment.java
+++ b/car-ui-lib/src/com/android/car/ui/preference/ListPreferenceFragment.java
@@ -119,8 +119,10 @@
             }
 
             item.setOnCheckedChangedListener((listItem, isChecked) -> {
-                mSelectedItem.setChecked(false);
-                adapter.notifyItemChanged(listItems.indexOf(mSelectedItem));
+                if (mSelectedItem != null) {
+                    mSelectedItem.setChecked(false);
+                    adapter.notifyItemChanged(listItems.indexOf(mSelectedItem));
+                }
                 mSelectedItem = listItem;
             });
 
@@ -128,11 +130,13 @@
         }
 
         toolbar.registerOnBackListener(() -> {
-            int selectedIndex = listItems.indexOf(mSelectedItem);
-            String entryValue = entryValues[selectedIndex].toString();
+            if (mSelectedItem != null) {
+                int selectedIndex = listItems.indexOf(mSelectedItem);
+                String entryValue = entryValues[selectedIndex].toString();
 
-            if (mPreference.callChangeListener(entryValue)) {
-                mPreference.setValue(entryValue);
+                if (mPreference.callChangeListener(entryValue)) {
+                    mPreference.setValue(entryValue);
+                }
             }
 
             return false;