commit f8ac5c3469e53a7934731cfb854efb2975251ab4
author Alan Viverette <alanv@google.com> Wed Oct 07 16:36:58 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Oct 07 16:36:58 2015 +0000
tree 32c4051ec1125ac6a092f1369b23f5c6b6b6df6a
parent e229f5ddde98f7c78ddc15a64587a684b5cf90a5
parent 5e18c40d28cba98607d34f50e972c4d977c3dd6c

Merge "Reset the setOnKeyListener callback when view is destroyed"

core/java/android/preference/PreferenceFragment.java

diff --git a/core/java/android/preference/PreferenceFragment.java b/core/java/android/preference/PreferenceFragment.java
index 66642de..db04c71 100644
--- a/core/java/android/preference/PreferenceFragment.java
+++ b/core/java/android/preference/PreferenceFragment.java
@@ -214,6 +214,9 @@
 
     @Override
     public void onDestroyView() {
+        if (mList != null) {
+            mList.setOnKeyListener(null);
+        }
         mList = null;
         mHandler.removeCallbacks(mRequestFocus);
         mHandler.removeMessages(MSG_BIND_PREFERENCES);