Merge \"added null check in doInBackground and if null, properly intializes variables.\" into nyc-dev

am: 07a375186e

Change-Id: Icd7c52967c634dbdbef55166523039f4004e4d9a

packages/SettingsLib/src/com/android/settingslib/drawer/SettingsDrawerActivity.java

@@ -325,6 +325,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++) {