Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: a393be9

* commit 'a393be93196d89a53d53097941857b539f88da96':
  Add cancelation signal to OnRequestPrinterIcon.

Change-Id: I4a46ed1c0b9ab90edaae138ecbe0c15f82403794
This commit is contained in:
Philip P. Moltmann
2016-03-30 15:30:29 +00:00
committed by android-build-merger
parent 2ff245e3ec a393be9319
commit 7f5f0de5c4
7 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

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

2
api/system-current.txt
View File

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

2
api/test-current.txt
View File

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

5
core/java/android/printservice/PrinterDiscoverySession.java
View File

@@ -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);
}
}

4
core/tests/coretests/src/android/print/BasePrintTest.java
View File

@@ -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(

3
core/tests/coretests/src/android/print/mockservice/PrinterDiscoverySessionCallbacks.java
View File

@@ -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);

5
core/tests/coretests/src/android/print/mockservice/StubbablePrinterDiscoverySession.java
View File

@@ -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);
}
}