commit 09d276371560a8e20e80a7f05a6807b5b8f0ace3
author Fabrice Di Meglio <fdimeglio@google.com> Wed Nov 26 00:31:49 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Nov 26 00:31:50 2014 +0000
tree cbc242f02005a6f7de199d6bae82c5c9ef6c903b
parent 647f9752ce1bdd4c02cd44028dac769369140764
parent 21dba1f0e7a7df64e4e9211153523f09d4bdd9df

Merge "IllegalStateException fixed in print service settings" into lmp-mr1-dev

src/com/android/settings/print/PrintServiceSettingsFragment.java

diff --git a/src/com/android/settings/print/PrintServiceSettingsFragment.java b/src/com/android/settings/print/PrintServiceSettingsFragment.java
index 49fd6df..e36e92c 100644
--- a/src/com/android/settings/print/PrintServiceSettingsFragment.java
+++ b/src/com/android/settings/print/PrintServiceSettingsFragment.java
@@ -137,6 +137,8 @@
 
     private boolean mServiceEnabled;
 
+    private SearchView mSearchView;
+
     @Override
     public void onResume() {
         super.onResume();
@@ -148,6 +150,9 @@
     @Override
     public void onPause() {
         mSettingsContentObserver.unregister(getContentResolver());
+        if (mSearchView != null) {
+            mSearchView.setOnQueryTextListener(null);
+        }
         super.onPause();
     }
 
@@ -408,8 +413,8 @@
 
         MenuItem searchItem = menu.findItem(R.id.print_menu_item_search);
         if (mServiceEnabled && mPrintersAdapter.getUnfilteredCount() > 0) {
-            SearchView searchView = (SearchView) searchItem.getActionView();
-            searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
+            mSearchView = (SearchView) searchItem.getActionView();
+            mSearchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
                 @Override
                 public boolean onQueryTextSubmit(String query) {
                     return true;
@@ -421,7 +426,7 @@
                     return true;
                 }
             });
-            searchView.addOnAttachStateChangeListener(new View.OnAttachStateChangeListener() {
+            mSearchView.addOnAttachStateChangeListener(new View.OnAttachStateChangeListener() {
                 @Override
                 public void onViewAttachedToWindow(View view) {
                     if (AccessibilityManager.getInstance(getActivity()).isEnabled()) {