From e54d79c4cd6f90ccc6288df7a09d91698d603d9e Mon Sep 17 00:00:00 2001 From: "Philip P. Moltmann" Date: Mon, 28 Mar 2016 17:13:34 -0700 Subject: [PATCH] Add cancelation signal to OnRequestPrinterIcon. Change-Id: I072d2c15e8df104a8b902c10d14d9f02040ace5f --- api/current.txt | 3 ++- api/system-current.txt | 3 ++- api/test-current.txt | 3 ++- core/java/android/printservice/PrinterDiscoverySession.java | 5 ++++- core/tests/coretests/src/android/print/BasePrintTest.java | 4 +++- .../print/mockservice/PrinterDiscoverySessionCallbacks.java | 3 ++- .../print/mockservice/StubbablePrinterDiscoverySession.java | 5 +++-- 7 files changed, 18 insertions(+), 8 deletions(-) diff --git a/api/current.txt b/api/current.txt index 0857c8bb696ea..b1e31b2731844 100644 --- a/api/current.txt +++ b/api/current.txt @@ -30367,7 +30367,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); method public abstract void onStartPrinterStateTracking(android.print.PrinterId); method public abstract void onStopPrinterDiscovery(); @@ -66433,3 +66433,4 @@ package org.xmlpull.v1.sax2 { } } + diff --git a/api/system-current.txt b/api/system-current.txt index 99a4ad3c448a6..18163b5e5e179 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -32682,7 +32682,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); method public abstract void onStartPrinterStateTracking(android.print.PrinterId); method public abstract void onStopPrinterDiscovery(); @@ -69498,3 +69498,4 @@ package org.xmlpull.v1.sax2 { } } + diff --git a/api/test-current.txt b/api/test-current.txt index 6cf047a2d411c..3755351a9f9bf 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -30436,7 +30436,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); method public abstract void onStartPrinterStateTracking(android.print.PrinterId); method public abstract void onStopPrinterDiscovery(); @@ -66507,3 +66507,4 @@ package org.xmlpull.v1.sax2 { } } + diff --git a/core/java/android/printservice/PrinterDiscoverySession.java b/core/java/android/printservice/PrinterDiscoverySession.java index cd5a903c4e696..7b9533d732161 100644 --- a/core/java/android/printservice/PrinterDiscoverySession.java +++ b/core/java/android/printservice/PrinterDiscoverySession.java @@ -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); } } diff --git a/core/tests/coretests/src/android/print/BasePrintTest.java b/core/tests/coretests/src/android/print/BasePrintTest.java index c9bc8aaae0cb7..d56a405ba0bb8 100644 --- a/core/tests/coretests/src/android/print/BasePrintTest.java +++ b/core/tests/coretests/src/android/print/BasePrintTest.java @@ -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( diff --git a/core/tests/coretests/src/android/print/mockservice/PrinterDiscoverySessionCallbacks.java b/core/tests/coretests/src/android/print/mockservice/PrinterDiscoverySessionCallbacks.java index 26b7caeba15fe..be002e29ff687 100644 --- a/core/tests/coretests/src/android/print/mockservice/PrinterDiscoverySessionCallbacks.java +++ b/core/tests/coretests/src/android/print/mockservice/PrinterDiscoverySessionCallbacks.java @@ -16,6 +16,7 @@ package android.print.mockservice; +import android.os.CancellationSignal; import android.print.PrinterId; import android.printservice.CustomPrinterIconCallback; @@ -42,7 +43,7 @@ public abstract class PrinterDiscoverySessionCallbacks { public abstract void onStartPrinterStateTracking(PrinterId printerId); public abstract void onRequestCustomPrinterIcon(PrinterId printerId, - CustomPrinterIconCallback callback); + CancellationSignal cancellationSignal, CustomPrinterIconCallback callback); public abstract void onStopPrinterStateTracking(PrinterId printerId); diff --git a/core/tests/coretests/src/android/print/mockservice/StubbablePrinterDiscoverySession.java b/core/tests/coretests/src/android/print/mockservice/StubbablePrinterDiscoverySession.java index 04683f267aab0..e132d79cfd8bd 100644 --- a/core/tests/coretests/src/android/print/mockservice/StubbablePrinterDiscoverySession.java +++ b/core/tests/coretests/src/android/print/mockservice/StubbablePrinterDiscoverySession.java @@ -16,6 +16,7 @@ package android.print.mockservice; +import android.os.CancellationSignal; import android.print.PrinterId; import android.printservice.CustomPrinterIconCallback; import android.printservice.PrintService; @@ -70,9 +71,9 @@ public class StubbablePrinterDiscoverySession extends PrinterDiscoverySession { @Override public void onRequestCustomPrinterIcon(PrinterId printerId, - CustomPrinterIconCallback callback) { + CancellationSignal cancellationSignal, CustomPrinterIconCallback callback) { if (mCallbacks != null) { - mCallbacks.onRequestCustomPrinterIcon(printerId, callback); + mCallbacks.onRequestCustomPrinterIcon(printerId, cancellationSignal, callback); } }