diff options
| -rw-r--r-- | api/test-current.txt | 10 | ||||
| -rw-r--r-- | core/java/android/print/PrintManager.java | 3 | ||||
| -rw-r--r-- | core/java/android/printservice/PrintServiceInfo.java | 2 | ||||
| -rwxr-xr-x | core/java/android/provider/Settings.java | 1 |
4 files changed, 16 insertions, 0 deletions
diff --git a/api/test-current.txt b/api/test-current.txt index 9b5b1a2b9c36..de738f9a4802 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -32596,7 +32596,9 @@ package android.print { public final class PrintManager { method public java.util.List<android.print.PrintJob> getPrintJobs(); + method public java.util.List<android.printservice.PrintServiceInfo> getPrintServices(int); method public android.print.PrintJob print(java.lang.String, android.print.PrintDocumentAdapter, android.print.PrintAttributes); + field public static final int ALL_SERVICES = 3; // 0x3 } public final class PrinterCapabilitiesInfo implements android.os.Parcelable { @@ -32726,6 +32728,13 @@ package android.printservice { field public static final java.lang.String SERVICE_META_DATA = "android.printservice"; } + public final class PrintServiceInfo implements android.os.Parcelable { + method public int describeContents(); + method public android.content.ComponentName getComponentName(); + method public void writeToParcel(android.os.Parcel, int); + field public static final android.os.Parcelable.Creator<android.printservice.PrintServiceInfo> CREATOR; + } + public abstract class PrinterDiscoverySession { ctor public PrinterDiscoverySession(); method public final void addPrinters(java.util.List<android.print.PrinterInfo>); @@ -34989,6 +34998,7 @@ package android.provider { field public static final java.lang.String DEFAULT_INPUT_METHOD = "default_input_method"; field public static final deprecated java.lang.String DEVELOPMENT_SETTINGS_ENABLED = "development_settings_enabled"; field public static final deprecated java.lang.String DEVICE_PROVISIONED = "device_provisioned"; + field public static final java.lang.String DISABLED_PRINT_SERVICES = "disabled_print_services"; field public static final java.lang.String ENABLED_ACCESSIBILITY_SERVICES = "enabled_accessibility_services"; field public static final java.lang.String ENABLED_INPUT_METHODS = "enabled_input_methods"; field public static final java.lang.String ENABLED_NOTIFICATION_POLICY_ACCESS_PACKAGES = "enabled_notification_policy_access_packages"; diff --git a/core/java/android/print/PrintManager.java b/core/java/android/print/PrintManager.java index e8ff2e2cee98..52dccb432766 100644 --- a/core/java/android/print/PrintManager.java +++ b/core/java/android/print/PrintManager.java @@ -20,6 +20,7 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; import android.annotation.SystemService; +import android.annotation.TestApi; import android.app.Activity; import android.app.Application.ActivityLifecycleCallbacks; import android.content.ComponentName; @@ -141,6 +142,7 @@ public final class PrintManager { * @see #getPrintServices * @hide */ + @TestApi public static final int ALL_SERVICES = ENABLED_SERVICES | DISABLED_SERVICES; /** @@ -627,6 +629,7 @@ public final class PrintManager { * * @hide */ + @TestApi @SystemApi public @NonNull List<PrintServiceInfo> getPrintServices(int selectionFlags) { Preconditions.checkFlagsArgument(selectionFlags, ALL_SERVICES); diff --git a/core/java/android/printservice/PrintServiceInfo.java b/core/java/android/printservice/PrintServiceInfo.java index 57f122923c69..5ef93193c67c 100644 --- a/core/java/android/printservice/PrintServiceInfo.java +++ b/core/java/android/printservice/PrintServiceInfo.java @@ -18,6 +18,7 @@ package android.printservice; import android.annotation.NonNull; import android.annotation.SystemApi; +import android.annotation.TestApi; import android.content.ComponentName; import android.content.Context; import android.content.pm.PackageManager; @@ -48,6 +49,7 @@ import java.io.IOException; * * @hide */ +@TestApi @SystemApi public final class PrintServiceInfo implements Parcelable { diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 6a17ed1500bd..f1ce9d52e920 100755 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -5850,6 +5850,7 @@ public final class Settings { * * @hide */ + @TestApi public static final String DISABLED_PRINT_SERVICES = "disabled_print_services"; |