am c7222124: Merge "Printers for a disappearing print serivce incorrectly removed." into klp-dev (d8adcd21) · Commits · e / os / android_frameworks_base

core/java/android/print/IPrinterDiscoveryObserver.aidl

+0 −1

Original line number	Diff line number	Diff line
		@@ -16,7 +16,6 @@

		package android.print;

		import android.print.IPrintClient;
		import android.print.PrinterId;
		import android.print.PrinterInfo;

+8 −8

Original line number	Diff line number	Diff line
		@@ -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();
		}
		}