[Expressive Design] Add null check for icon view in dropdown list.

- Fix crash when clicking spinner under original style.

Fix: 406403111
Test: disable flag & test manual
Flag: com.android.settingslib.widget.theme.flags.is_expressive_design_enabled
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:11d1c56f67295d2ecdaab3834e6174acdd22e0bb)
Merged-In: I4b2337ed0285afd943a9790d22089320e9a22b49
Change-Id: I4b2337ed0285afd943a9790d22089320e9a22b49

1 files changed, 5 insertions, 1 deletions

diff --git a/packages/SettingsLib/SettingsSpinner/src/com/android/settingslib/widget/SettingsSpinnerAdapter.java b/packages/SettingsLib/SettingsSpinner/src/com/android/settingslib/widget/SettingsSpinnerAdapter.java
index 2f9f7038f6f7..08f9d33613ab 100644
--- a/packages/SettingsLib/SettingsSpinner/src/com/android/settingslib/widget/SettingsSpinnerAdapter.java
+++ b/packages/SettingsLib/SettingsSpinner/src/com/android/settingslib/widget/SettingsSpinnerAdapter.java
@@ -24,8 +24,10 @@ import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 import android.widget.ImageView;
 import android.widget.TextView;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+
 import com.android.settingslib.widget.SettingsSpinnerPreference.Style;
 import com.android.settingslib.widget.spinner.R;
 
@@ -71,7 +73,9 @@ public class SettingsSpinnerAdapter<T> extends ArrayAdapter<T> {
         }
         TextView textView = view.findViewById(android.R.id.text1);
         ImageView iconView = view.findViewById(android.R.id.icon);
-        iconView.setVisibility((position == mSelectedPosition) ? View.VISIBLE : View.GONE);
+        if (iconView != null) {
+            iconView.setVisibility((position == mSelectedPosition) ? View.VISIBLE : View.GONE);
+        }
         String item = (String) getItem(position);
         textView.setText(item);
         return view;