summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author David Liu <dswliu@google.com> 2025-03-27 13:09:58 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 2025-04-21 19:27:22 -0700
commitccc1005b98781f1c299f28cbcd285302431ecc55 (patch)
treea97bf3f14f0849c9604526aa71f726d0a8f25eb5
parentf05830866fbdcd05e0fc287d927a823143eac33d (diff)
Fix crash in SettingsSpinnerAdapter
getItem(position) will return T but not String. It'll always crash if T is not String. Bug: 406736217 Test: manual Flag: EXEMPT bugfix (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:075cf4e48461614bb97c10edab3c7fd1a397000d) Merged-In: Ic85341cd66770792ad986fa34a461d9eed95dc18 Change-Id: Ic85341cd66770792ad986fa34a461d9eed95dc18
-rw-r--r--packages/SettingsLib/SettingsSpinner/src/com/android/settingslib/widget/SettingsSpinnerAdapter.java4
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;
}