From 1b52e0d0240040478ebbe9ac2244816c39ddcd4e Mon Sep 17 00:00:00 2001
From: Amith Yamasani <yamasani@google.com>
Date: Fri, 12 Aug 2011 11:14:51 -0700
Subject: [PATCH] Potential fix for NPE in AccessibilitySettings.

Bug: 5093363
Change-Id: I1e6b9bf0fd25b0298606035155bb87e6f64711c4
---
 src/com/android/settings/AccessibilitySettings.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/com/android/settings/AccessibilitySettings.java b/src/com/android/settings/AccessibilitySettings.java
index cb56e63d0e2..e1b44e72bec 100644
--- a/src/com/android/settings/AccessibilitySettings.java
+++ b/src/com/android/settings/AccessibilitySettings.java
@@ -254,6 +254,7 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
     }
 
     public void removeToggleAccessibilitySwitch() {
+        mToggleAccessibilitySwitch.setOnBeforeCheckedChangeListener(null);
         getActivity().getActionBar().setCustomView(null);
     }
 
@@ -778,6 +779,7 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
             if (mOldActivityTitle != null) {
                 getActivity().getActionBar().setTitle(mOldActivityTitle);
             }
+            mToggleSwitch.setOnBeforeCheckedChangeListener(null);
             super.onDestroyView();
         }