commit e63c1f0e7e3c97ee3f4a71105acb3e331b6e22a6
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Dec 24 03:27:32 2019 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Dec 24 03:27:32 2019 +0000
tree 04194a323d03bdb6fe80ccce24b200ad6e826c43
parent bff236f4a059f4098dc05a956baf904c819410aa
parent c94d37e18091be7839a14891a118b24d33566f48

Fix ListPreference crash when the preference has no value am: c94d37e180

Change-Id: I914b0cc17537670d3a0c6316c4733288f1ace536

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;