From 8dd9206abbca6d143e3874abf46eca67f5340b31 Mon Sep 17 00:00:00 2001 From: Daniel Sandler Date: Fri, 14 Sep 2012 17:29:12 -0700 Subject: Fix NPE in rotation lock QS. Bug: 7172228 Change-Id: I3ac35e18fe7ce5af13ee4c54dabae80df696c819 --- .../com/android/systemui/statusbar/phone/QuickSettingsModel.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsModel.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsModel.java index 031504f..f239110 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsModel.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsModel.java @@ -399,7 +399,11 @@ class QuickSettingsModel implements BluetoothStateChangeCallback, mRotationLockState.label = locked ? mContext.getString(R.string.quick_settings_rotation_locked_label) : mContext.getString(R.string.quick_settings_rotation_unlocked_label); - mRotationLockCallback.refreshView(mRotationLockTile, mRotationLockState); + + // may be called before addRotationLockTile due to RotationPolicyListener in QuickSettings + if (mRotationLockTile != null && mRotationLockCallback != null) { + mRotationLockCallback.refreshView(mRotationLockTile, mRotationLockState); + } } } \ No newline at end of file -- cgit v1.1