commit 77a6080aebc9754bff2307edc1998bd54657fbb5
author Jeff Brown <jeffbrown@google.com> Tue Jun 12 13:16:04 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Jun 12 13:16:04 2012 -0700
tree bc5b8649c2694b4c8f421eaae4ae1f908f1a8f29
parent ecb96401786c784eef8016625db80a7e2d3714f0
parent b5858bbdc363e21bf87ac5643822ec9e57956c52

am b5858bbd: Fix NPE in rotation lock content observer.

* commit 'b5858bbdc363e21bf87ac5643822ec9e57956c52':
  Fix NPE in rotation lock content observer.

src/com/android/settings/AccessibilitySettings.java

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 @@
     }
 
     private void updateLockScreenRotationCheckbox() {
-        mToggleLockScreenRotationPreference.setChecked(
-                !RotationPolicy.isRotationLocked(getActivity()));
+        Context context = getActivity();
+        if (context != null) {
+            mToggleLockScreenRotationPreference.setChecked(
+                    !RotationPolicy.isRotationLocked(context));
+        }
     }
 
     private void offerInstallAccessibilitySerivceOnce() {