diff --git a/packages/PrintSpooler/src/com/android/printspooler/SelectPrinterFragment.java b/packages/PrintSpooler/src/com/android/printspooler/SelectPrinterFragment.java
index 20315ca..7a91cef 100644
--- a/packages/PrintSpooler/src/com/android/printspooler/SelectPrinterFragment.java
+++ b/packages/PrintSpooler/src/com/android/printspooler/SelectPrinterFragment.java
@@ -52,6 +52,7 @@
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.accessibility.AccessibilityManager;
 import android.widget.ArrayAdapter;
 import android.widget.BaseAdapter;
 import android.widget.Filter;
@@ -138,13 +139,19 @@
         searchView.addOnAttachStateChangeListener(new View.OnAttachStateChangeListener() {
             @Override
             public void onViewAttachedToWindow(View view) {
-                view.announceForAccessibility(getString(
-                        R.string.print_search_box_shown_utterance));
+                if (AccessibilityManager.getInstance(getActivity()).isEnabled()) {
+                    view.announceForAccessibility(getString(
+                            R.string.print_search_box_shown_utterance));
+                }
             }
             @Override
             public void onViewDetachedFromWindow(View view) {
-                view.announceForAccessibility(getString(
-                        R.string.print_search_box_hidden_utterance));
+                Activity activity = getActivity();
+                if (activity != null && !activity.isFinishing()
+                        && AccessibilityManager.getInstance(activity).isEnabled()) {
+                    view.announceForAccessibility(getString(
+                            R.string.print_search_box_hidden_utterance));
+                }
             }
         });
 
