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

Commit 8f6feec7 authored by Philip P. Moltmann's avatar Philip P. Moltmann
Browse files

Allow print services to read advanced options. 

Test: Ran adjusted test that is subitted along side
Change-Id: Ic662c6a6e56c3184611b30947fd715b57df196c0
Fixes: 28913410
parent 68116413

api/current.txt

+3 −0
Original line number Diff line number Diff line
@@ -30307,6 +30307,8 @@ package android.print { 














  public final class PrintJobInfo implements android.os.Parcelable {















    method public int describeContents();













    method public int getAdvancedIntOption(java.lang.String);













    method public java.lang.String getAdvancedStringOption(java.lang.String);















    method public android.print.PrintAttributes getAttributes();















    method public int getCopies();















    method public long getCreationTime();









@@ -30315,6 +30317,7 @@ package android.print {













    method public android.print.PageRange[] getPages();















    method public android.print.PrinterId getPrinterId();















    method public int getState();













    method public boolean hasAdvancedOption(java.lang.String);















    method public void writeToParcel(android.os.Parcel, int);















    field public static final android.os.Parcelable.Creator<android.print.PrintJobInfo> CREATOR;















    field public static final int STATE_BLOCKED = 4; // 0x4

























api/system-current.txt



+3
−0




























Original line number
Diff line number
Diff line








@@ -32907,6 +32907,8 @@ package android.print {



























  public final class PrintJobInfo implements android.os.Parcelable {















    method public int describeContents();













    method public int getAdvancedIntOption(java.lang.String);













    method public java.lang.String getAdvancedStringOption(java.lang.String);















    method public android.print.PrintAttributes getAttributes();















    method public int getCopies();















    method public long getCreationTime();









@@ -32915,6 +32917,7 @@ package android.print {













    method public android.print.PageRange[] getPages();















    method public android.print.PrinterId getPrinterId();















    method public int getState();













    method public boolean hasAdvancedOption(java.lang.String);















    method public void writeToParcel(android.os.Parcel, int);















    field public static final android.os.Parcelable.Creator<android.print.PrintJobInfo> CREATOR;















    field public static final int STATE_BLOCKED = 4; // 0x4

























api/test-current.txt



+3
−0




























Original line number
Diff line number
Diff line








@@ -30382,6 +30382,8 @@ package android.print {



























  public final class PrintJobInfo implements android.os.Parcelable {















    method public int describeContents();













    method public int getAdvancedIntOption(java.lang.String);













    method public java.lang.String getAdvancedStringOption(java.lang.String);















    method public android.print.PrintAttributes getAttributes();















    method public int getCopies();















    method public long getCreationTime();









@@ -30392,6 +30394,7 @@ package android.print {













    method public float getProgress();















    method public int getState();















    method public java.lang.CharSequence getStatus(android.content.pm.PackageManager);













    method public boolean hasAdvancedOption(java.lang.String);















    method public void writeToParcel(android.os.Parcel, int);















    field public static final android.os.Parcelable.Creator<android.print.PrintJobInfo> CREATOR;















    field public static final int STATE_BLOCKED = 4; // 0x4

























core/java/android/print/PrintJobInfo.java



+0
−6




























Original line number
Diff line number
Diff line








@@ -586,8 +586,6 @@ public final class PrintJobInfo implements Parcelable {













     *















     * @param key The option key.















     * @return Whether the option is present.













     *













     * @hide















     */















    public boolean hasAdvancedOption(String key) {















        return mAdvancedOptions != null && mAdvancedOptions.containsKey(key);









@@ -598,8 +596,6 @@ public final class PrintJobInfo implements Parcelable {













     *















     * @param key The option key.















     * @return The option value.













     *













     * @hide















     */















    public String getAdvancedStringOption(String key) {















        if (mAdvancedOptions != null) {









@@ -613,8 +609,6 @@ public final class PrintJobInfo implements Parcelable {













     *















     * @param key The option key.















     * @return The option value.













     *













     * @hide















     */















    public int getAdvancedIntOption(String key) {















        if (mAdvancedOptions != null) {