commit 1dc3b790df61aa95cb68da390045249c59049fcd
author Adam Powell <adamp@android.com> Fri Jul 12 15:09:54 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Jul 12 15:09:54 2013 -0700
tree bd40969f0326f971fc4a269e2a02ad7dfc2a4b35
parent f094eefc34013c7167effa558b488709eaa54751
parent 4b8cc94cc67d760e724c56aee9301d1bcc2bbe89

am 4b8cc94c: Merge "PreferenceActivity should not leave message in looper when destroyed"

* commit '4b8cc94cc67d760e724c56aee9301d1bcc2bbe89':
  PreferenceActivity should not leave message in looper when destroyed

core/java/android/preference/PreferenceActivity.java

diff --git a/core/java/android/preference/PreferenceActivity.java b/core/java/android/preference/PreferenceActivity.java
index 028317f..a9ee96e 100644
--- a/core/java/android/preference/PreferenceActivity.java
+++ b/core/java/android/preference/PreferenceActivity.java
@@ -901,6 +901,8 @@
 
     @Override
     protected void onDestroy() {
+        mHandler.removeMessages(MSG_BIND_PREFERENCES);
+        mHandler.removeMessages(MSG_BUILD_HEADERS);
         super.onDestroy();
 
         if (mPreferenceManager != null) {