commit b1477739b0225027e70b11d9a2876f0210ddc6ab
author Daniel Sandler <dsandler@android.com> Tue Oct 16 19:54:02 2012 -0400
committer The Android Automerger <android-build@android.com> Tue Oct 16 17:25:44 2012 -0700
tree beb5ea065336230d3ff363da1b76aff059478354
parent 1b2415fbdf0cab96a6682cfd87094160ca51bfdb

Fix NPE in quick settings tiles.

Bug: 7360759
Change-Id: I5b000e063baa1b7e2dddaa25be5b9bcdafa1a974

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
index 64bce22..d4ccf96 100644
--- 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 @@
                 }
 
                 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 @@
                     mSettingsPanel.setQuickSettings(mQS);
                 }
                 mQS.setService(this);
+                mQS.setBar(mStatusBarView);
                 mQS.setup(mNetworkController, mBluetoothController, mBatteryController,
                         mLocationController);
             } else {