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();