Merge "Fix NPE in Display Settings." into jb-dev

This commit is contained in:
Amith Yamasani
2012-05-14 17:53:28 -07:00
committed by Android (Google) Code Review

View File

@@ -236,6 +236,7 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
} }
private void updateAccelerometerRotationCheckbox() { private void updateAccelerometerRotationCheckbox() {
if (getActivity() == null) return;
mAccelerometer.setChecked(Settings.System.getInt( mAccelerometer.setChecked(Settings.System.getInt(
getContentResolver(), getContentResolver(),
Settings.System.ACCELEROMETER_ROTATION, 0) != 0); Settings.System.ACCELEROMETER_ROTATION, 0) != 0);