From b1a50f2dff3d2d24c3567e2be67e7a4bc87a9b31 Mon Sep 17 00:00:00 2001
From: Fabrice Di Meglio <fdimeglio@google.com>
Date: Wed, 13 Aug 2014 10:41:40 -0700
Subject: [PATCH] Fix bug #16957601 Stability: ISE in Settings: Observer
 com.android.settings. SettingsPreferenceFragment$1@273c8fdb was not
 registered

- add onUnbindPreferences() call to match onBindPreferences()
- this new method is @hide so it does not impact the APIs

Change-Id: Iee0ab8a4ecc2046f89fb96cc52af150e835f658c
---
 core/java/android/preference/PreferenceFragment.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/core/java/android/preference/PreferenceFragment.java b/core/java/android/preference/PreferenceFragment.java
index acd79424fbbeb..e95e6e21b2518 100644
--- a/core/java/android/preference/PreferenceFragment.java
+++ b/core/java/android/preference/PreferenceFragment.java
@@ -258,6 +258,7 @@ public abstract class PreferenceFragment extends Fragment implements
      */
     public void setPreferenceScreen(PreferenceScreen preferenceScreen) {
         if (mPreferenceManager.setPreferences(preferenceScreen) && preferenceScreen != null) {
+            onUnbindPreferences();
             mHavePrefs = true;
             if (mInitDone) {
                 postBindPreferences();
@@ -349,6 +350,10 @@ public abstract class PreferenceFragment extends Fragment implements
     protected void onBindPreferences() {
     }
 
+    /** @hide */
+    protected void onUnbindPreferences() {
+    }
+
     /** @hide */
     public ListView getListView() {
         ensureList();