Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Printers for a disappearing print serivce incorrectly removed." into klp-dev

Browse Source
This commit is contained in:
Svetoslav Ganov
2013-09-07 22:05:14 +00:00
committed by Android (Google) Code Review
parent 70cdfe7eb1 4e4518383f
commit c72221242e
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/java/android/print/IPrinterDiscoveryObserver.aidl
View File

@@ -16,7 +16,6 @@
package android.print;
import android.print.IPrintClient;
import android.print.PrinterId;
import android.print.PrinterInfo;

16
services/java/com/android/server/print/UserState.java
View File

@@ -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();
}
}