diff options
| author | Daniel Sandler <dsandler@android.com> | 2012-10-16 19:54:02 -0400 |
|---|---|---|
| committer | Daniel Sandler <dsandler@android.com> | 2012-10-16 19:54:02 -0400 |
| commit | fe3376b41aa48b6894afad9b977170bc658a6ac1 (patch) | |
| tree | b8efcc273972a465240bf8513ebe4742db7b3345 /packages/SystemUI/src | |
| parent | 983faeed0b8090e12d10a31624e1cf09ff30c20c (diff) | |
| download | frameworks_base-fe3376b41aa48b6894afad9b977170bc658a6ac1.zip frameworks_base-fe3376b41aa48b6894afad9b977170bc658a6ac1.tar.gz frameworks_base-fe3376b41aa48b6894afad9b977170bc658a6ac1.tar.bz2 | |
Fix NPE in quick settings tiles.
Bug: 7360759
Change-Id: I5b000e063baa1b7e2dddaa25be5b9bcdafa1a974
Diffstat (limited to 'packages/SystemUI/src')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java | 3 |
1 files changed, 1 insertions, 2 deletions
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 @@ 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 { |