Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d0ff8967 authored by Svetoslav Ganov's avatar Svetoslav Ganov Committed by Android Git Automerger
Browse files

am d8adcd21: am c7222124: Merge "Printers for a disappearing print serivce... 

am d8adcd21: am c7222124: Merge "Printers for a disappearing print serivce incorrectly removed." into klp-dev

* commit 'd8adcd21':
  Printers for a disappearing print serivce incorrectly removed.
parents f32df5d8 d8adcd21

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;

services/java/com/android/server/print/UserState.java

+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();

            }

        }