Merge "Ensure only test print services enabled - framework" into oc-dev am: 053fb9120e (72fc8a5f) · Commits · e / os / android_frameworks_base

api/test-current.txt

+10 −0

Original line number	Original line	Diff line number	Diff line
	@@ -32618,7 +32618,9 @@ package android.print {

	public final class PrintManager {		public final class PrintManager {
	method public java.util.List<android.print.PrintJob> getPrintJobs();		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);		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 {		public final class PrinterCapabilitiesInfo implements android.os.Parcelable {
	@@ -32748,6 +32750,13 @@ package android.printservice {
	field public static final java.lang.String SERVICE_META_DATA = "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 {		public abstract class PrinterDiscoverySession {
	ctor public PrinterDiscoverySession();		ctor public PrinterDiscoverySession();
	method public final void addPrinters(java.util.List<android.print.PrinterInfo>);		method public final void addPrinters(java.util.List<android.print.PrinterInfo>);
	@@ -35011,6 +35020,7 @@ package android.provider {
	field public static final java.lang.String DEFAULT_INPUT_METHOD = "default_input_method";		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 DEVELOPMENT_SETTINGS_ENABLED = "development_settings_enabled";
	field public static final deprecated java.lang.String DEVICE_PROVISIONED = "device_provisioned";		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_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_INPUT_METHODS = "enabled_input_methods";
	field public static final java.lang.String ENABLED_NOTIFICATION_POLICY_ACCESS_PACKAGES = "enabled_notification_policy_access_packages";		field public static final java.lang.String ENABLED_NOTIFICATION_POLICY_ACCESS_PACKAGES = "enabled_notification_policy_access_packages";

core/java/android/print/PrintManager.java

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -20,6 +20,7 @@ import android.annotation.NonNull;
	import android.annotation.Nullable;		import android.annotation.Nullable;
	import android.annotation.SystemApi;		import android.annotation.SystemApi;
	import android.annotation.SystemService;		import android.annotation.SystemService;
			import android.annotation.TestApi;
	import android.app.Activity;		import android.app.Activity;
	import android.app.Application.ActivityLifecycleCallbacks;		import android.app.Application.ActivityLifecycleCallbacks;
	import android.content.ComponentName;		import android.content.ComponentName;
	@@ -141,6 +142,7 @@ public final class PrintManager {
	* @see #getPrintServices		* @see #getPrintServices
	* @hide		* @hide
	*/		*/
			@TestApi
	public static final int ALL_SERVICES = ENABLED_SERVICES \| DISABLED_SERVICES;		public static final int ALL_SERVICES = ENABLED_SERVICES \| DISABLED_SERVICES;

	/**		/**
	@@ -627,6 +629,7 @@ public final class PrintManager {
	*		*
	* @hide		* @hide
	*/		*/
			@TestApi
	@SystemApi		@SystemApi
	public @NonNull List<PrintServiceInfo> getPrintServices(int selectionFlags) {		public @NonNull List<PrintServiceInfo> getPrintServices(int selectionFlags) {
	Preconditions.checkFlagsArgument(selectionFlags, ALL_SERVICES);		Preconditions.checkFlagsArgument(selectionFlags, ALL_SERVICES);

core/java/android/printservice/PrintServiceInfo.java

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -18,6 +18,7 @@ package android.printservice;

	import android.annotation.NonNull;		import android.annotation.NonNull;
	import android.annotation.SystemApi;		import android.annotation.SystemApi;
			import android.annotation.TestApi;
	import android.content.ComponentName;		import android.content.ComponentName;
	import android.content.Context;		import android.content.Context;
	import android.content.pm.PackageManager;		import android.content.pm.PackageManager;
	@@ -48,6 +49,7 @@ import java.io.IOException;
	*		*
	* @hide		* @hide
	*/		*/
			@TestApi
	@SystemApi		@SystemApi
	public final class PrintServiceInfo implements Parcelable {		public final class PrintServiceInfo implements Parcelable {

core/java/android/provider/Settings.java

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -5878,6 +5878,7 @@ public final class Settings {
	*		*
	* @hide		* @hide
	*/		*/
			@TestApi
	public static final String DISABLED_PRINT_SERVICES =		public static final String DISABLED_PRINT_SERVICES =
	"disabled_print_services";		"disabled_print_services";