From 45657b3b46f4cb45fbad5eb8e1ff5940ed9b66d5 Mon Sep 17 00:00:00 2001
From: mqi <mqi@codeaurora.org>
Date: Sun, 4 Jun 2017 20:03:01 +0800
Subject: 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
---
 core/java/android/widget/ArrayAdapter.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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());
-- 
cgit v1.2.3