diff options
| author | Amith Yamasani <yamasani@google.com> | 2012-05-14 17:46:23 -0700 |
|---|---|---|
| committer | Amith Yamasani <yamasani@google.com> | 2012-05-14 17:46:23 -0700 |
| commit | 980a6c3c4be59550db5140366096ea0640c99651 (patch) | |
| tree | cb7bfacee2b702f0887a72c745307a261c9591e7 /src/com/android/settings/DisplaySettings.java | |
| parent | e5050b1be72c5552bfc9c734d5a0e89f215bed62 (diff) | |
| download | packages_apps_Settings-980a6c3c4be59550db5140366096ea0640c99651.zip packages_apps_Settings-980a6c3c4be59550db5140366096ea0640c99651.tar.gz packages_apps_Settings-980a6c3c4be59550db5140366096ea0640c99651.tar.bz2 | |
Fix NPE in Display Settings.
Handle occasional race in delivering change notifications.
Bug: 6012882
Change-Id: Ic9eff72920ff65a2c8ab85f4af59ba438cd8f99f
Diffstat (limited to 'src/com/android/settings/DisplaySettings.java')
| -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); |