Merge "Add @UnsupportedAppUsage annotations" (35ba945c) · Commits · e / os / android_frameworks_base

config/hiddenapi-light-greylist.txt

+0 −4

Original line number	Original line	Diff line number	Diff line
	@@ -4286,10 +4286,6 @@ Landroid/preference/VolumePreference$VolumeStore;->originalVolume:I
	Landroid/preference/VolumePreference$VolumeStore;->volume:I		Landroid/preference/VolumePreference$VolumeStore;->volume:I
	Landroid/preference/VolumePreference;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V		Landroid/preference/VolumePreference;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;)V
	Landroid/preference/VolumePreference;->mStreamType:I		Landroid/preference/VolumePreference;->mStreamType:I
	Landroid/print/PrinterId;->getServiceName()Landroid/content/ComponentName;
	Landroid/print/PrintJobInfo;->getAdvancedOptions()Landroid/os/Bundle;
	Landroid/print/PrintJobInfo;->getDocumentInfo()Landroid/print/PrintDocumentInfo;
	Landroid/print/PrintManager;->addPrintJobStateChangeListener(Landroid/print/PrintManager$PrintJobStateChangeListener;)V
	Landroid/provider/Browser;->getVisitedHistory(Landroid/content/ContentResolver;)[Ljava/lang/String;		Landroid/provider/Browser;->getVisitedHistory(Landroid/content/ContentResolver;)[Ljava/lang/String;
	Landroid/provider/Browser;->sendString(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;)V		Landroid/provider/Browser;->sendString(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;)V
	Landroid/provider/BrowserContract$Accounts;->CONTENT_URI:Landroid/net/Uri;		Landroid/provider/BrowserContract$Accounts;->CONTENT_URI:Landroid/net/Uri;

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -362,8 +362,6 @@ Landroid/os/SystemVibrator;-><init>()V
	Landroid/os/UserHandle;->isSameApp(II)Z		Landroid/os/UserHandle;->isSameApp(II)Z
	Landroid/os/UserManager;->hasUserRestriction(Ljava/lang/String;Landroid/os/UserHandle;)Z		Landroid/os/UserManager;->hasUserRestriction(Ljava/lang/String;Landroid/os/UserHandle;)Z
	Landroid/os/UserManager;->isAdminUser()Z		Landroid/os/UserManager;->isAdminUser()Z
	Landroid/print/PrintDocumentAdapter$LayoutResultCallback;-><init>()V
	Landroid/print/PrintDocumentAdapter$WriteResultCallback;-><init>()V
	Landroid/provider/CalendarContract$Events;->PROVIDER_WRITABLE_COLUMNS:[Ljava/lang/String;		Landroid/provider/CalendarContract$Events;->PROVIDER_WRITABLE_COLUMNS:[Ljava/lang/String;
	Landroid/provider/ContactsContract$CommonDataKinds$Phone;->getDisplayLabel(Landroid/content/Context;ILjava/lang/CharSequence;)Ljava/lang/CharSequence;		Landroid/provider/ContactsContract$CommonDataKinds$Phone;->getDisplayLabel(Landroid/content/Context;ILjava/lang/CharSequence;)Ljava/lang/CharSequence;
	Landroid/provider/Settings$Global;->getStringForUser(Landroid/content/ContentResolver;Ljava/lang/String;I)Ljava/lang/String;		Landroid/provider/Settings$Global;->getStringForUser(Landroid/content/ContentResolver;Ljava/lang/String;I)Ljava/lang/String;

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -16,6 +16,7 @@

	package android.print;		package android.print;

			import android.annotation.UnsupportedAppUsage;
	import android.os.Bundle;		import android.os.Bundle;
	import android.os.CancellationSignal;		import android.os.CancellationSignal;
	import android.os.ParcelFileDescriptor;		import android.os.ParcelFileDescriptor;
	@@ -260,6 +261,7 @@ public abstract class PrintDocumentAdapter {
	/**		/**
	* @hide		* @hide
	*/		*/
			@UnsupportedAppUsage
	public WriteResultCallback() {		public WriteResultCallback() {
	/* do nothing - hide constructor */		/* do nothing - hide constructor */
	}		}
	@@ -304,6 +306,7 @@ public abstract class PrintDocumentAdapter {
	/**		/**
	* @hide		* @hide
	*/		*/
			@UnsupportedAppUsage
	public LayoutResultCallback() {		public LayoutResultCallback() {
	/* do nothing - hide constructor */		/* do nothing - hide constructor */
	}		}

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -23,6 +23,7 @@ import android.annotation.NonNull;
	import android.annotation.Nullable;		import android.annotation.Nullable;
	import android.annotation.StringRes;		import android.annotation.StringRes;
	import android.annotation.TestApi;		import android.annotation.TestApi;
			import android.annotation.UnsupportedAppUsage;
	import android.content.pm.PackageManager;		import android.content.pm.PackageManager;
	import android.content.res.Resources;		import android.content.res.Resources;
	import android.os.Bundle;		import android.os.Bundle;
	@@ -543,6 +544,7 @@ public final class PrintJobInfo implements Parcelable {
	*		*
	* @hide		* @hide
	*/		*/
			@UnsupportedAppUsage
	public PrintDocumentInfo getDocumentInfo() {		public PrintDocumentInfo getDocumentInfo() {
	return mDocumentInfo;		return mDocumentInfo;
	}		}
	@@ -624,6 +626,7 @@ public final class PrintJobInfo implements Parcelable {
	*		*
	* @hide		* @hide
	*/		*/
			@UnsupportedAppUsage
	public Bundle getAdvancedOptions() {		public Bundle getAdvancedOptions() {
	return mAdvancedOptions;		return mAdvancedOptions;
	}		}

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -21,6 +21,7 @@ import android.annotation.Nullable;
	import android.annotation.RequiresPermission;		import android.annotation.RequiresPermission;
	import android.annotation.SystemApi;		import android.annotation.SystemApi;
	import android.annotation.SystemService;		import android.annotation.SystemService;
			import android.annotation.UnsupportedAppUsage;
	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;
	@@ -308,6 +309,7 @@ public final class PrintManager {
	* @param listener The listener to add.		* @param listener The listener to add.
	* @hide		* @hide
	*/		*/
			@UnsupportedAppUsage
	public void addPrintJobStateChangeListener(PrintJobStateChangeListener listener) {		public void addPrintJobStateChangeListener(PrintJobStateChangeListener listener) {
	if (mService == null) {		if (mService == null) {
	Log.w(LOG_TAG, "Feature android.software.print not available");		Log.w(LOG_TAG, "Feature android.software.print not available");