From 565f258dc8798ac64a93f88ef88f04dd8b8a75f7 Mon Sep 17 00:00:00 2001 From: Fabian Kozynski Date: Wed, 19 Dec 2018 17:39:53 -0500 Subject: [PATCH] Fixes NPE in TileQueryHelper Change-Id: I475efd88aeb5a7db45e844131cf302b23d28f1a9 Fixes: 121271663 Test: atest --- .../android/systemui/qs/customize/TileQueryHelper.java | 2 ++ .../systemui/qs/customize/TileQueryHelperTest.java | 8 ++++++++ 2 files changed, 10 insertions(+) diff --git a/packages/SystemUI/src/com/android/systemui/qs/customize/TileQueryHelper.java b/packages/SystemUI/src/com/android/systemui/qs/customize/TileQueryHelper.java index 9d2be39b28fc1..4dcacd4bffdcf 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/customize/TileQueryHelper.java +++ b/packages/SystemUI/src/com/android/systemui/qs/customize/TileQueryHelper.java @@ -87,6 +87,8 @@ public class TileQueryHelper { if (current != null) { // The setting QS_TILES is not populated immediately upon Factory Reset possibleTiles.addAll(Arrays.asList(current.split(","))); + } else { + current = ""; } String[] stockSplit = stock.split(","); for (String spec : stockSplit) { diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/customize/TileQueryHelperTest.java b/packages/SystemUI/tests/src/com/android/systemui/qs/customize/TileQueryHelperTest.java index 26fa20de4e86a..c3a3e6339daa1 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/customize/TileQueryHelperTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/customize/TileQueryHelperTest.java @@ -218,4 +218,12 @@ public class TileQueryHelperTest extends SysuiTestCase { } assertFalse(specs.contains("other")); } + + @Test + public void testQueryTiles_nullSetting() { + Settings.Secure.putString(mContext.getContentResolver(), Settings.Secure.QS_TILES, null); + mContext.getOrCreateTestableResources().addOverride(R.string.quick_settings_tiles_stock, + STOCK_TILES); + mTileQueryHelper.queryTiles(mQSTileHost); + } }