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

Commit a393be93 authored by Philip P. Moltmann's avatar Philip P. Moltmann Committed by Android (Google) Code Review
Browse files

Merge "Add cancelation signal to OnRequestPrinterIcon." into nyc-dev

parents c37a3236 e54d79c4

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -30370,7 +30370,7 @@ package android.printservice { 
    method public final boolean isDestroyed();

    method public final boolean isPrinterDiscoveryStarted();

    method public abstract void onDestroy();

    method public void onRequestCustomPrinterIcon(android.print.PrinterId, android.printservice.CustomPrinterIconCallback);

    method public void onRequestCustomPrinterIcon(android.print.PrinterId, android.os.CancellationSignal, android.printservice.CustomPrinterIconCallback);

    method public abstract void onStartPrinterDiscovery(java.util.List<android.print.PrinterId>);

    method public abstract void onStartPrinterStateTracking(android.print.PrinterId);

    method public abstract void onStopPrinterDiscovery();

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -32685,7 +32685,7 @@ package android.printservice { 
    method public final boolean isDestroyed();

    method public final boolean isPrinterDiscoveryStarted();

    method public abstract void onDestroy();

    method public void onRequestCustomPrinterIcon(android.print.PrinterId, android.printservice.CustomPrinterIconCallback);

    method public void onRequestCustomPrinterIcon(android.print.PrinterId, android.os.CancellationSignal, android.printservice.CustomPrinterIconCallback);

    method public abstract void onStartPrinterDiscovery(java.util.List<android.print.PrinterId>);

    method public abstract void onStartPrinterStateTracking(android.print.PrinterId);

    method public abstract void onStopPrinterDiscovery();

api/test-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -30439,7 +30439,7 @@ package android.printservice { 
    method public final boolean isDestroyed();

    method public final boolean isPrinterDiscoveryStarted();

    method public abstract void onDestroy();

    method public void onRequestCustomPrinterIcon(android.print.PrinterId, android.printservice.CustomPrinterIconCallback);

    method public void onRequestCustomPrinterIcon(android.print.PrinterId, android.os.CancellationSignal, android.printservice.CustomPrinterIconCallback);

    method public abstract void onStartPrinterDiscovery(java.util.List<android.print.PrinterId>);

    method public abstract void onStartPrinterStateTracking(android.print.PrinterId);

    method public abstract void onStopPrinterDiscovery();

core/java/android/printservice/PrinterDiscoverySession.java

+4 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package android.printservice; 


import android.annotation.NonNull;

import android.content.pm.ParceledListSlice;

import android.os.CancellationSignal;

import android.os.RemoteException;

import android.print.PrinterCapabilitiesInfo;

import android.print.PrinterId;
@@ -412,11 +413,13 @@ public abstract class PrinterDiscoverySession { 
     * service.

     *

     * @param printerId The printer to icon belongs to.

     * @param cancellationSignal Signal used to cancel the request

     * @param callback Callback for returning the icon to the print spooler.

     *

     * @see android.print.PrinterInfo.Builder#setHasCustomPrinterIcon()

     */

    public void onRequestCustomPrinterIcon(@NonNull PrinterId printerId,

            @NonNull CancellationSignal cancellationSignal,

            @NonNull CustomPrinterIconCallback callback) {

    }
@@ -533,7 +536,7 @@ public abstract class PrinterDiscoverySession { 
        if (!mIsDestroyed && mObserver != null) {

            CustomPrinterIconCallback callback = new CustomPrinterIconCallback(printerId,

                    mObserver);

            onRequestCustomPrinterIcon(printerId, callback);

            onRequestCustomPrinterIcon(printerId, new CancellationSignal(), callback);

        }

    }

core/tests/coretests/src/android/print/BasePrintTest.java

+3 −1
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import android.content.Context; 
import android.content.pm.PackageManager;

import android.content.res.Configuration;

import android.content.res.Resources;

import android.os.CancellationSignal;

import android.os.ParcelFileDescriptor;

import android.os.SystemClock;

import android.print.PrintAttributes;
@@ -281,7 +282,8 @@ public abstract class BasePrintTest extends InstrumentationTestCase { 
        }

        if (onRequestCustomPrinterIcon != null) {

            doAnswer(onRequestCustomPrinterIcon).when(callbacks).onRequestCustomPrinterIcon(

                    any(PrinterId.class), any(CustomPrinterIconCallback.class));

                    any(PrinterId.class), any(CancellationSignal.class),

                    any(CustomPrinterIconCallback.class));

        }

        if (onStopPrinterStateTracking != null) {

            doAnswer(onStopPrinterStateTracking).when(callbacks).onStopPrinterStateTracking(