From 980a6c3c4be59550db5140366096ea0640c99651 Mon Sep 17 00:00:00 2001
From: Amith Yamasani <yamasani@google.com>
Date: Mon, 14 May 2012 17:46:23 -0700
Subject: [PATCH] Fix NPE in Display Settings.

Handle occasional race in delivering change notifications.

Bug: 6012882
Change-Id: Ic9eff72920ff65a2c8ab85f4af59ba438cd8f99f
---
 src/com/android/settings/DisplaySettings.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java
index 8ffd84a5fd0..df80f85f004 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);