am 2b7ed31f: am fe3376b4: Fix NPE in quick settings tiles.

* commit '2b7ed31f8b851a588db7c9acdae8a60b35940fe3':
  Fix NPE in quick settings tiles.
This commit is contained in:
Daniel Sandler
2012-10-16 17:26:02 -07:00
committed by Android Git Automerger

View File

@@ -541,8 +541,6 @@ public class PhoneStatusBar extends BaseStatusBar {
}
if (mSettingsPanel != null) {
mSettingsPanel.setBar(mStatusBarView);
if (!ActivityManager.isHighEndGfx()) {
mSettingsPanel.setBackground(new FastColorDrawable(context.getResources().getColor(
R.color.notification_panel_solid_background)));
@@ -563,6 +561,7 @@ public class PhoneStatusBar extends BaseStatusBar {
mSettingsPanel.setQuickSettings(mQS);
}
mQS.setService(this);
mQS.setBar(mStatusBarView);
mQS.setup(mNetworkController, mBluetoothController, mBatteryController,
mLocationController);
} else {