From 8c4e4b0865dada1f89c72b8abd44229df44a3250 Mon Sep 17 00:00:00 2001
From: Richard Ho <horichard@google.com>
Date: Mon, 13 Jun 2016 16:54:04 -0700
Subject: [PATCH] added null check in doInBackground and if null, properly
 intializes variables.

Bug:29234237
Change-Id: I1d65b1a232c71efdd11a917769aec5044867a085
(cherry picked from commit 0f0f5414f4860de7f5e98d783b3172a39a42df2f)
---
 .../android/settingslib/drawer/SettingsDrawerActivity.java | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/packages/SettingsLib/src/com/android/settingslib/drawer/SettingsDrawerActivity.java b/packages/SettingsLib/src/com/android/settingslib/drawer/SettingsDrawerActivity.java
index ce916cba312a8..37e3c531229a8 100644
--- a/packages/SettingsLib/src/com/android/settingslib/drawer/SettingsDrawerActivity.java
+++ b/packages/SettingsLib/src/com/android/settingslib/drawer/SettingsDrawerActivity.java
@@ -307,6 +307,13 @@ public class SettingsDrawerActivity extends Activity {
             return TileUtils.getCategories(SettingsDrawerActivity.this, sTileCache);
         }
 
+        @Override
+        protected void onPreExecute() {
+            if (sConfigTracker == null || sTileCache == null) {
+                getDashboardCategories();
+            }
+        }
+
         @Override
         protected void onPostExecute(List<DashboardCategory> dashboardCategories) {
             for (int i = 0; i < dashboardCategories.size(); i++) {