Fix NPE in rotation lock QS.

dsandler · dsandler · commit 8dd9206abbca · 2012-09-14T17:29:21.000-07:00
Bug: 7172228
Change-Id: I3ac35e18fe7ce5af13ee4c54dabae80df696c819
diff --git 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 @@ void onRotationLockChanged() {
         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);
+        }
     }
 
 }

Original file line number	Diff line number	Diff line change
`@@ -399,7 +399,11 @@ void onRotationLockChanged() {`
`399`	`399`	`mRotationLockState.label = locked`
`400`	`400`	`? mContext.getString(R.string.quick_settings_rotation_locked_label)`
`401`	`401`	`: mContext.getString(R.string.quick_settings_rotation_unlocked_label);`
`402`		`- mRotationLockCallback.refreshView(mRotationLockTile, mRotationLockState);`
	`402`	`+`
	`403`	`+ // may be called before addRotationLockTile due to RotationPolicyListener in QuickSettings`
	`404`	`+ if (mRotationLockTile != null && mRotationLockCallback != null) {`
	`405`	`+ mRotationLockCallback.refreshView(mRotationLockTile, mRotationLockState);`
	`406`	`+ }`
`403`	`407`	`}`
`404`	`408`
`405`	`409`	`}`