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

Commit 826debf5 authored by Svetoslav Ganov's avatar Svetoslav Ganov Committed by Android (Google) Code Review
Browse files

Merge "Print UI bug fixing and printer discovery refactoring." into klp-dev

parents 83bc5a8a 44720af5

Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -162,6 +162,7 @@ LOCAL_SRC_FILES += \ 
	core/java/android/os/IVibratorService.aidl \

	core/java/android/service/notification/INotificationListener.aidl \

	core/java/android/print/ILayoutResultCallback.aidl \

	core/java/android/print/IPrinterDiscoveryObserver.aidl \

	core/java/android/print/IPrintDocumentAdapter.aidl \

	core/java/android/print/IPrintClient.aidl \

	core/java/android/print/IPrintManager.aidl \

core/java/android/os/RemoteCallbackList.java

+0 −2
Original line number Diff line number Diff line
@@ -18,8 +18,6 @@ package android.os; 


import android.util.ArrayMap;



import java.util.HashMap;



/**

 * Takes care of the grunt work of maintaining a list of remote interfaces,

 * typically for the use of performing callbacks from a

core/java/android/print/IPrintManager.aidl

+10 −0
Original line number Diff line number Diff line
@@ -16,8 +16,10 @@ 


package android.print;



import android.print.IPrinterDiscoveryObserver;

import android.print.IPrintDocumentAdapter;

import android.print.IPrintClient;

import android.print.PrinterId;

import android.print.PrintJobInfo;

import android.print.PrintAttributes;
@@ -34,4 +36,12 @@ interface IPrintManager { 
            int appId, int userId);

    void cancelPrintJob(int printJobId, int appId, int userId);

    void restartPrintJob(int printJobId, int appId, int userId);



    void createPrinterDiscoverySession(in IPrinterDiscoveryObserver observer, int userId);

    void startPrinterDiscovery(in IPrinterDiscoveryObserver observer,

            in List<PrinterId> priorityList, int userId);

    void stopPrinterDiscovery(in IPrinterDiscoveryObserver observer, int userId);

    void requestPrinterUpdate(in PrinterId printerId, int userId);

    void destroyPrinterDiscoverySession(in IPrinterDiscoveryObserver observer,

            int userId);

}

core/java/android/print/IPrintSpooler.aidl

+0 −6
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package android.print; 


import android.content.ComponentName;

import android.os.ParcelFileDescriptor;

import android.print.PrinterId;

import android.print.IPrintDocumentAdapter;

import android.print.IPrintClient;

import android.print.IPrintSpoolerClient;
@@ -47,9 +46,4 @@ oneway interface IPrintSpooler { 
            int sequence);

    void writePrintJobData(in ParcelFileDescriptor fd, int printJobId);

    void setClient(IPrintSpoolerClient client);



    // Printer discovery APIs

    void onPrintersAdded(in List<PrinterInfo> printers);

    void onPrintersRemoved(in List<PrinterId> printerIds);

    void onPrintersUpdated(in List<PrinterInfo> printerIds);

}

core/java/android/print/IPrintSpoolerClient.aidl

+0 −8
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package android.print;



import android.content.ComponentName;

import android.print.PrinterId;

import android.print.PrintJobInfo;
@@ -30,11 +29,4 @@ oneway interface IPrintSpoolerClient { 
    void onPrintJobQueued(in PrintJobInfo printJob);

    void onAllPrintJobsForServiceHandled(in ComponentName printService);

    void onAllPrintJobsHandled();



    // Printer discovery APIs

    void createPrinterDiscoverySession();

    void startPrinterDiscovery(in List<PrinterId> priorityList);

    void stopPrinterDiscovery();

    void requestPrinterUpdate(in PrinterId printerId);

    void destroyPrinterDiscoverySession();

}