commit 5e18c40d28cba98607d34f50e972c4d977c3dd6c
author Mykola Kondratenko <mykola.kondratenko@sonymobile.com> Mon Feb 09 19:20:28 2015 +0100
committer Henrik Baard <henrik.baard@sonymobile.com> Wed Jul 08 06:26:41 2015 +0000
tree fd5e33634c4ffb1379d7e9ec88213d35cee37d67
parent aa87e89e81b547cc28e09a5f71adb288ee18b32a

Reset the setOnKeyListener callback when view is destroyed

NPE happened in mListOnKeyListener.onKey().

It looks like onKey in some cases is sent to a view while beeing
destroyed. When callback is received mList is referenced causing
the NPE.

Remove OnKeyListener first when destroying view so we can not get
any unwanted key callbacks.

Bug: 22333421

Change-Id: I94b198e31a2f9fbdd7fbadf4971be7720dcfad8d

core/java/android/preference/PreferenceFragment.java

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