summaryrefslogtreecommitdiffstats
path: root/src/com/android
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2012-06-12 13:16:04 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-06-12 13:16:04 -0700
commit77a6080aebc9754bff2307edc1998bd54657fbb5 (patch)
treebc5b8649c2694b4c8f421eaae4ae1f908f1a8f29 /src/com/android
parentecb96401786c784eef8016625db80a7e2d3714f0 (diff)
parentb5858bbdc363e21bf87ac5643822ec9e57956c52 (diff)
downloadpackages_apps_settings-77a6080aebc9754bff2307edc1998bd54657fbb5.zip
packages_apps_settings-77a6080aebc9754bff2307edc1998bd54657fbb5.tar.gz
packages_apps_settings-77a6080aebc9754bff2307edc1998bd54657fbb5.tar.bz2
am b5858bbd: Fix NPE in rotation lock content observer.
* commit 'b5858bbdc363e21bf87ac5643822ec9e57956c52': Fix NPE in rotation lock content observer.
Diffstat (limited to 'src/com/android')
-rw-r--r--src/com/android/settings/AccessibilitySettings.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/com/android/settings/AccessibilitySettings.java b/src/com/android/settings/AccessibilitySettings.java
index 149e336..6167f78 100644
--- a/src/com/android/settings/AccessibilitySettings.java
+++ b/src/com/android/settings/AccessibilitySettings.java
@@ -449,8 +449,11 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
}
private void updateLockScreenRotationCheckbox() {
- mToggleLockScreenRotationPreference.setChecked(
- !RotationPolicy.isRotationLocked(getActivity()));
+ Context context = getActivity();
+ if (context != null) {
+ mToggleLockScreenRotationPreference.setChecked(
+ !RotationPolicy.isRotationLocked(context));
+ }
}
private void offerInstallAccessibilitySerivceOnce() {