summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormqi <mqi@codeaurora.org>2017-06-04 20:03:01 +0800
committeralk3pInjection <webmaster@raspii.tech>2022-01-27 18:50:18 +0800
commit45657b3b46f4cb45fbad5eb8e1ff5940ed9b66d5 (patch)
tree32bbec63e32e422ce82c3cadd5e3c7d77acd7351
parent69d4a277e5f04b54c8489ab72e42402912b52b15 (diff)
Fix NPE in QS Customizer
Add a null pointer check to avoid crash when customizing quick settings in systemui. CRs-Fixed: 1094610 Change-Id: I03eaaaeeb8bbf7fbc91ca09eb16dd1ab559d2d6f
-rw-r--r--core/java/android/widget/ArrayAdapter.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/widget/ArrayAdapter.java b/core/java/android/widget/ArrayAdapter.java
index de9f76d6eea1..30c8d7c167aa 100644
--- a/core/java/android/widget/ArrayAdapter.java
+++ b/core/java/android/widget/ArrayAdapter.java
@@ -448,7 +448,9 @@ public class ArrayAdapter<T> extends BaseAdapter implements Filterable, ThemedSp
}
final T item = getItem(position);
- if (item instanceof CharSequence) {
+ if (item == null) {
+ text.setText("");
+ } else if (item instanceof CharSequence) {
text.setText((CharSequence) item);
} else {
text.setText(item.toString());