Merge "Reset the setOnKeyListener callback when view is destroyed"

2015-10-07 16:36:58 +00:00
parent e229f5ddde 5e18c40d28
commit f8ac5c3469
1 changed files with 3 additions and 0 deletions
--- a/core/java/android/preference/PreferenceFragment.java
+++ b/core/java/android/preference/PreferenceFragment.java
@@ -214,6 +214,9 @@ public abstract class PreferenceFragment extends Fragment implements

    @Override
    public void onDestroyView() {
+        if (mList != null) {
+            mList.setOnKeyListener(null);
+        }
        mList = null;
        mHandler.removeCallbacks(mRequestFocus);
        mHandler.removeMessages(MSG_BIND_PREFERENCES);