commit c7edbf4d66b177c0ab1447e96e2fad1d49c5d0ed
author Daniel Sandler <dsandler@android.com> Tue Oct 16 17:26:02 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Oct 16 17:26:02 2012 -0700
tree 14ea25576e4ecbb897c2ecb6e143c8ad0335121b
parent dad4fb5de960a7059521d950a4f1a6d2920dff44
parent 2b7ed31f8b851a588db7c9acdae8a60b35940fe3

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

* commit '2b7ed31f8b851a588db7c9acdae8a60b35940fe3':
  Fix NPE in quick settings tiles.

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 {