Skip to content

Commit fe3376b

Browse files
committed
Fix NPE in quick settings tiles.
Bug: 7360759 Change-Id: I5b000e063baa1b7e2dddaa25be5b9bcdafa1a974
1 parent 983faee commit fe3376b

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -541,8 +541,6 @@ public void onSizeChanged(View view, int w, int h, int oldw, int oldh) {
541541
}
542542

543543
if (mSettingsPanel != null) {
544-
mSettingsPanel.setBar(mStatusBarView);
545-
546544
if (!ActivityManager.isHighEndGfx()) {
547545
mSettingsPanel.setBackground(new FastColorDrawable(context.getResources().getColor(
548546
R.color.notification_panel_solid_background)));
@@ -563,6 +561,7 @@ public void onSizeChanged(View view, int w, int h, int oldw, int oldh) {
563561
mSettingsPanel.setQuickSettings(mQS);
564562
}
565563
mQS.setService(this);
564+
mQS.setBar(mStatusBarView);
566565
mQS.setup(mNetworkController, mBluetoothController, mBatteryController,
567566
mLocationController);
568567
} else {

0 commit comments

Comments
 (0)