diff options
| author | Amith Yamasani <yamasani@google.com> | 2012-05-14 17:53:28 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-05-14 17:53:28 -0700 |
| commit | 904bc3155f06a1b02ac8a5985ac781d8d6dee798 (patch) | |
| tree | f4ef70c9ef3904e9b21691f95513b26ce059f58f | |
| parent | 106368400d4798e14daf3c32100bc87c35a480b0 (diff) | |
| parent | 980a6c3c4be59550db5140366096ea0640c99651 (diff) | |
| download | packages_apps_Settings-904bc3155f06a1b02ac8a5985ac781d8d6dee798.zip packages_apps_Settings-904bc3155f06a1b02ac8a5985ac781d8d6dee798.tar.gz packages_apps_Settings-904bc3155f06a1b02ac8a5985ac781d8d6dee798.tar.bz2 | |
Merge "Fix NPE in Display Settings." into jb-dev
| -rw-r--r-- | src/com/android/settings/DisplaySettings.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java index 8ffd84a..df80f85 100644 --- a/src/com/android/settings/DisplaySettings.java +++ b/src/com/android/settings/DisplaySettings.java @@ -236,6 +236,7 @@ public class DisplaySettings extends SettingsPreferenceFragment implements } private void updateAccelerometerRotationCheckbox() { + if (getActivity() == null) return; mAccelerometer.setChecked(Settings.System.getInt( getContentResolver(), Settings.System.ACCELEROMETER_ROTATION, 0) != 0); |