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

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

Merge "Print API for N: Fix docs and change interfaces as requested." into nyc-dev

parents 1fa35628 b9987641

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -30330,7 +30330,7 @@ package android.print.pdf { 














package android.printservice {



























  public class CustomPrinterIconCallback {













  public final class CustomPrinterIconCallback {















    method public boolean onCustomPrinterIconLoaded(android.graphics.drawable.Icon);















  }







































api/system-current.txt



+1
−1




























Original line number
Diff line number
Diff line








@@ -32829,7 +32829,7 @@ package android.print.pdf {



























package android.printservice {



























  public class CustomPrinterIconCallback {













  public final class CustomPrinterIconCallback {















    method public boolean onCustomPrinterIconLoaded(android.graphics.drawable.Icon);















  }







































api/test-current.txt



+1
−1




























Original line number
Diff line number
Diff line








@@ -30402,7 +30402,7 @@ package android.print.pdf {



























package android.printservice {



























  public class CustomPrinterIconCallback {













  public final class CustomPrinterIconCallback {















    method public boolean onCustomPrinterIconLoaded(android.graphics.drawable.Icon);















  }







































core/java/android/printservice/CustomPrinterIconCallback.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -27,7 +27,7 @@ import android.util.Log;













/**















 * Callback for {@link PrinterDiscoverySession#onRequestCustomPrinterIcon}.















 */













public class CustomPrinterIconCallback {













public final class CustomPrinterIconCallback {















    /** The printer the call back is for */















    private final @NonNull PrinterId mPrinterId;















    private final @NonNull IPrintServiceClient mObserver;

































core/java/android/printservice/PrintJob.java



+3
−6




























Original line number
Diff line number
Diff line








@@ -347,18 +347,15 @@ public final class PrintJob {













     * <p />















     * This overrides any previously set status set via {@link #setStatus(CharSequence)},















     * {@link #setStatus(int)}, {@link #block(String)}, or {@link #fail(String)},













     * <p />













     * To clear the status use {@link #setStatus(CharSequence) <code>setStatus(null)</code>}















     *













     * @param status  The new status as a String resource.













     * @param statusResId The new status as a String resource. If 0 the status will be empty.















     */















    @MainThread













    public void setStatus(@StringRes int status) {













    public void setStatus(@StringRes int statusResId) {















        PrintService.throwIfNotCalledOnMainThread();













        Preconditions.checkArgument(status != 0, "status has to be != 0");































        try {













            mPrintServiceClient.setStatusRes(mCachedInfo.getId(), status,













            mPrintServiceClient.setStatusRes(mCachedInfo.getId(), statusResId,















                    mContext.getPackageName());















        } catch (RemoteException re) {















            Log.e(LOG_TAG, "Error setting status for job: " + mCachedInfo.getId(), re);