diff --git a/src/com/android/settings/print/PrintSettingsFragment.java b/src/com/android/settings/print/PrintSettingsFragment.java
index fad577c..a1c1660 100644
--- a/src/com/android/settings/print/PrintSettingsFragment.java
+++ b/src/com/android/settings/print/PrintSettingsFragment.java
@@ -529,7 +529,7 @@
             if (mPrintManager != null) {
                 if (isListening) {
                     List<PrintServiceInfo> services =
-                            mPrintManager.getPrintServices(PrintManager.ALL_SERVICES);
+                            mPrintManager.getPrintServices(PrintManager.ENABLED_SERVICES);
                     if (services == null || services.isEmpty()) {
                         mSummaryLoader.setSummary(this,
                                 mContext.getString(R.string.print_settings_summary_no_service));
diff --git a/tests/robotests/src/com/android/settings/print/PrintSettingsFragmentTest.java b/tests/robotests/src/com/android/settings/print/PrintSettingsFragmentTest.java
index 265472e..0e2a2f6 100644
--- a/tests/robotests/src/com/android/settings/print/PrintSettingsFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/print/PrintSettingsFragmentTest.java
@@ -68,14 +68,15 @@
         when(printServices.isEmpty()).thenReturn(false);
         when(printServices.size()).thenReturn(2);
         // 2 services
-        when(mPrintManager.getPrintServices(PrintManager.ALL_SERVICES)).thenReturn(printServices);
+        when(mPrintManager.getPrintServices(PrintManager.ENABLED_SERVICES))
+            .thenReturn(printServices);
 
         mSummaryProvider.setListening(true);
 
         verify(mRes).getQuantityString(R.plurals.print_settings_summary, 2, 2);
 
         // No service
-        when(mPrintManager.getPrintServices(PrintManager.ALL_SERVICES)).thenReturn(null);
+        when(mPrintManager.getPrintServices(PrintManager.ENABLED_SERVICES)).thenReturn(null);
 
         mSummaryProvider.setListening(true);
 
