Merge cherrypicks of ['googleplex-android-review.googlesource.com/32740902'] into 25Q2-release.

Change-Id: I9603256482e5a5e07154d38c50aff050cf49f591

1 files changed, 2 insertions, 2 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 08f9d33613ab..47c6054b9315 100644
--- a/packages/SettingsLib/SettingsSpinner/src/com/android/settingslib/widget/SettingsSpinnerAdapter.java
+++ b/packages/SettingsLib/SettingsSpinner/src/com/android/settingslib/widget/SettingsSpinnerAdapter.java
@@ -76,8 +76,8 @@ public class SettingsSpinnerAdapter<T> extends ArrayAdapter<T> {
         if (iconView != null) {
             iconView.setVisibility((position == mSelectedPosition) ? View.VISIBLE : View.GONE);
         }
-        String item = (String) getItem(position);
-        textView.setText(item);
+        T item = getItem(position);
+        textView.setText(item == null ? "" : item.toString());
         return view;
     }