merge fix

Change-Id: Ib937f672769dc19b8706c8a0b695ed8a08398df4

diff --git a/packages/SettingsLib/src/com/android/settingslib/drawer/SettingsDrawerActivity.java b/packages/SettingsLib/src/com/android/settingslib/drawer/SettingsDrawerActivity.java
index a4742c1..6658c14 100644 (file)
--- a/packages/SettingsLib/src/com/android/settingslib/drawer/SettingsDrawerActivity.java
+++ b/packages/SettingsLib/src/com/android/settingslib/drawer/SettingsDrawerActivity.java
@@ -319,9 +319,6 @@ public class SettingsDrawerActivity extends Activity {
     private class CategoriesUpdater extends AsyncTask<Void, Void, List<DashboardCategory>> {
         @Override
         protected List<DashboardCategory> doInBackground(Void... params) {
-            if (sConfigTracker == null || sTileCache == null) {
-                getDashboardCategories();
-            }
             if (sConfigTracker.applyNewConfig(getResources())) {
                 sTileCache.clear();
             }