diff options
| author | Svetoslav Ganov <svetoslavganov@google.com> | 2013-09-07 22:05:14 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-07 22:05:14 +0000 |
| commit | c72221242e560b4176e6fb9e3eec1c32cc1b96c3 (patch) | |
| tree | 55ff57f1d01edae19061a5553e57ad631964a5d7 | |
| parent | 70cdfe7eb1d42d5e928f5c7c6106be4ebb8fde51 (diff) | |
| parent | 4e4518383f9212618cafa6c9ce2120becc6f6204 (diff) | |
| download | frameworks_base-c72221242e560b4176e6fb9e3eec1c32cc1b96c3.zip frameworks_base-c72221242e560b4176e6fb9e3eec1c32cc1b96c3.tar.gz frameworks_base-c72221242e560b4176e6fb9e3eec1c32cc1b96c3.tar.bz2 | |
Merge "Printers for a disappearing print serivce incorrectly removed." into klp-dev
| -rw-r--r-- | core/java/android/print/IPrinterDiscoveryObserver.aidl | 1 | ||||
| -rw-r--r-- | services/java/com/android/server/print/UserState.java | 16 |
2 files changed, 8 insertions, 9 deletions
diff --git a/core/java/android/print/IPrinterDiscoveryObserver.aidl b/core/java/android/print/IPrinterDiscoveryObserver.aidl index 71198f7..b558011 100644 --- a/core/java/android/print/IPrinterDiscoveryObserver.aidl +++ b/core/java/android/print/IPrinterDiscoveryObserver.aidl @@ -16,7 +16,6 @@ package android.print; -import android.print.IPrintClient; import android.print.PrinterId; import android.print.PrinterInfo; diff --git a/services/java/com/android/server/print/UserState.java b/services/java/com/android/server/print/UserState.java index 8fe979b..b37a0d9 100644 --- a/services/java/com/android/server/print/UserState.java +++ b/services/java/com/android/server/print/UserState.java @@ -779,21 +779,21 @@ final class UserState implements PrintSpoolerCallbacks { return; } // Remove the printers for that service. - List<PrinterInfo> removedPrinters = null; + List<PrinterId> removedPrinterIds = null; final int printerCount = mPrinters.size(); for (int i = 0; i < printerCount; i++) { - PrinterInfo printer = mPrinters.get(i); - if (printer.getId().getServiceName().equals(serviceName)) { - if (removedPrinters == null) { - removedPrinters = new ArrayList<PrinterInfo>(); + PrinterId printerId = mPrinters.keyAt(i); + if (printerId.getServiceName().equals(serviceName)) { + if (removedPrinterIds == null) { + removedPrinterIds = new ArrayList<PrinterId>(); } - removedPrinters.add(printer); + removedPrinterIds.add(printerId); } } - if (!removedPrinters.isEmpty()) { + if (!removedPrinterIds.isEmpty()) { mHandler.obtainMessage( SessionHandler.MSG_DISPATCH_PRINTERS_REMOVED, - removedPrinters).sendToTarget(); + removedPrinterIds).sendToTarget(); } } |