Fix NPE in quick settings tiles.

Bug: 7360759 Change-Id: I5b000e063baa1b7e2dddaa25be5b9bcdafa1a974
2012-10-16 19:54:02 -04:00
parent 983faeed0b
commit fe3376b41a
1 changed files with 1 additions and 2 deletions
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
@@ -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 {