resolve merge conflicts of 2ee069f73d2e9f978fd79b1c779930654d7f074b to stage-aosp-master (a5191dac) · Commits · e / os / android_frameworks_base

config/hiddenapi-light-greylist.txt

+0 −578

File changed.

Preview size limit exceeded, changes collapsed.

config/hiddenapi-vendor-list.txt

+0 −14

Original line number	Original line	Diff line number	Diff line
	@@ -25,20 +25,6 @@ Landroid/companion/ICompanionDeviceDiscoveryService$Stub;-><init>()V
	Landroid/companion/ICompanionDeviceDiscoveryServiceCallback;->onDeviceSelected(Ljava/lang/String;ILjava/lang/String;)V		Landroid/companion/ICompanionDeviceDiscoveryServiceCallback;->onDeviceSelected(Ljava/lang/String;ILjava/lang/String;)V
	Landroid/companion/ICompanionDeviceDiscoveryServiceCallback;->onDeviceSelectionCancel()V		Landroid/companion/ICompanionDeviceDiscoveryServiceCallback;->onDeviceSelectionCancel()V
	Landroid/companion/IFindDeviceCallback;->onSuccess(Landroid/app/PendingIntent;)V		Landroid/companion/IFindDeviceCallback;->onSuccess(Landroid/app/PendingIntent;)V
	Landroid/content/ContentProvider;-><init>(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;[Landroid/content/pm/PathPermission;)V
	Landroid/content/ContentProvider;->attachInfoForTesting(Landroid/content/Context;Landroid/content/pm/ProviderInfo;)V
	Landroid/content/ContentProvider;->getIContentProvider()Landroid/content/IContentProvider;
	Landroid/content/ContentResolver;->registerContentObserver(Landroid/net/Uri;ZLandroid/database/ContentObserver;I)V
	Landroid/content/ContentValues;->getStringArrayList(Ljava/lang/String;)Ljava/util/ArrayList;
	Landroid/content/ContentValues;->putStringArrayList(Ljava/lang/String;Ljava/util/ArrayList;)V
	Landroid/content/Context;->getOpPackageName()Ljava/lang/String;
	Landroid/content/Context;->registerReceiverAsUser(Landroid/content/BroadcastReceiver;Landroid/os/UserHandle;Landroid/content/IntentFilter;Ljava/lang/String;Landroid/os/Handler;)Landroid/content/Intent;
	Landroid/content/Context;->startActivityAsUser(Landroid/content/Intent;Landroid/os/UserHandle;)V
	Landroid/content/Context;->startServiceAsUser(Landroid/content/Intent;Landroid/os/UserHandle;)Landroid/content/ComponentName;
	Landroid/content/ContextWrapper;->getThemeResId()I
	Landroid/content/Intent;->getExtra(Ljava/lang/String;)Ljava/lang/Object;
	Landroid/content/Intent;->getIBinderExtra(Ljava/lang/String;)Landroid/os/IBinder;
	Landroid/content/Intent;->resolveSystemService(Landroid/content/pm/PackageManager;I)Landroid/content/ComponentName;
	Landroid/content/pm/IPackageDataObserver$Stub;-><init>()V		Landroid/content/pm/IPackageDataObserver$Stub;-><init>()V
	Landroid/content/pm/IPackageDeleteObserver$Stub;-><init>()V		Landroid/content/pm/IPackageDeleteObserver$Stub;-><init>()V
	Landroid/content/pm/IPackageDeleteObserver;->packageDeleted(Ljava/lang/String;I)V		Landroid/content/pm/IPackageDeleteObserver;->packageDeleted(Ljava/lang/String;I)V

core/java/android/content/AsyncTaskLoader.java

+3 −0

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

	package android.content;		package android.content;

			import android.annotation.UnsupportedAppUsage;
	import android.os.AsyncTask;		import android.os.AsyncTask;
	import android.os.Handler;		import android.os.Handler;
	import android.os.OperationCanceledException;		import android.os.OperationCanceledException;
	@@ -128,6 +129,7 @@ public abstract class AsyncTaskLoader<D> extends Loader<D> {
	}		}
	}		}

			@UnsupportedAppUsage
	private final Executor mExecutor;		private final Executor mExecutor;

	volatile LoadTask mTask;		volatile LoadTask mTask;
	@@ -354,6 +356,7 @@ public abstract class AsyncTaskLoader<D> extends Loader<D> {
	*		*
	* @hide		* @hide
	*/		*/
			@UnsupportedAppUsage
	public void waitForLoader() {		public void waitForLoader() {
	LoadTask task = mTask;		LoadTask task = mTask;
	if (task != null) {		if (task != null) {

core/java/android/content/BroadcastReceiver.java

+16 −0

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

	package android.content;		package android.content;

			import android.annotation.UnsupportedAppUsage;
	import android.app.ActivityManager;		import android.app.ActivityManager;
	import android.app.ActivityThread;		import android.app.ActivityThread;
	import android.app.IActivityManager;		import android.app.IActivityManager;
	@@ -43,6 +44,7 @@ import android.util.Slog;
	*		*
	*/		*/
	public abstract class BroadcastReceiver {		public abstract class BroadcastReceiver {
			@UnsupportedAppUsage
	private PendingResult mPendingResult;		private PendingResult mPendingResult;
	private boolean mDebugUnregister;		private boolean mDebugUnregister;

	@@ -69,20 +71,32 @@ public abstract class BroadcastReceiver {
	/** @hide */		/** @hide */
	public static final int TYPE_UNREGISTERED = 2;		public static final int TYPE_UNREGISTERED = 2;

			@UnsupportedAppUsage
	final int mType;		final int mType;
			@UnsupportedAppUsage
	final boolean mOrderedHint;		final boolean mOrderedHint;
			@UnsupportedAppUsage
	final boolean mInitialStickyHint;		final boolean mInitialStickyHint;
			@UnsupportedAppUsage
	final IBinder mToken;		final IBinder mToken;
			@UnsupportedAppUsage
	final int mSendingUser;		final int mSendingUser;
			@UnsupportedAppUsage
	final int mFlags;		final int mFlags;

			@UnsupportedAppUsage
	int mResultCode;		int mResultCode;
			@UnsupportedAppUsage
	String mResultData;		String mResultData;
			@UnsupportedAppUsage
	Bundle mResultExtras;		Bundle mResultExtras;
			@UnsupportedAppUsage
	boolean mAbortBroadcast;		boolean mAbortBroadcast;
			@UnsupportedAppUsage
	boolean mFinished;		boolean mFinished;

	/** @hide */		/** @hide */
			@UnsupportedAppUsage
	public PendingResult(int resultCode, String resultData, Bundle resultExtras, int type,		public PendingResult(int resultCode, String resultData, Bundle resultExtras, int type,
	boolean ordered, boolean sticky, IBinder token, int userId, int flags) {		boolean ordered, boolean sticky, IBinder token, int userId, int flags) {
	mResultCode = resultCode;		mResultCode = resultCode;
	@@ -595,6 +609,7 @@ public abstract class BroadcastReceiver {
	/**		/**
	* For internal use to set the result data that is active. @hide		* For internal use to set the result data that is active. @hide
	*/		*/
			@UnsupportedAppUsage
	public final void setPendingResult(PendingResult result) {		public final void setPendingResult(PendingResult result) {
	mPendingResult = result;		mPendingResult = result;
	}		}
	@@ -602,6 +617,7 @@ public abstract class BroadcastReceiver {
	/**		/**
	* For internal use to set the result data that is active. @hide		* For internal use to set the result data that is active. @hide
	*/		*/
			@UnsupportedAppUsage
	public final PendingResult getPendingResult() {		public final PendingResult getPendingResult() {
	return mPendingResult;		return mPendingResult;
	}		}

core/java/android/content/ClipData.java

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -21,6 +21,7 @@ import static android.content.ContentResolver.SCHEME_ANDROID_RESOURCE;
	import static android.content.ContentResolver.SCHEME_CONTENT;		import static android.content.ContentResolver.SCHEME_CONTENT;
	import static android.content.ContentResolver.SCHEME_FILE;		import static android.content.ContentResolver.SCHEME_FILE;

			import android.annotation.UnsupportedAppUsage;
	import android.content.res.AssetFileDescriptor;		import android.content.res.AssetFileDescriptor;
	import android.graphics.Bitmap;		import android.graphics.Bitmap;
	import android.net.Uri;		import android.net.Uri;
	@@ -197,6 +198,7 @@ public class ClipData implements Parcelable {
	final CharSequence mText;		final CharSequence mText;
	final String mHtmlText;		final String mHtmlText;
	final Intent mIntent;		final Intent mIntent;
			@UnsupportedAppUsage
	Uri mUri;		Uri mUri;

	/** @hide */		/** @hide */
	@@ -912,6 +914,7 @@ public class ClipData implements Parcelable {
	}		}

	/** @hide */		/** @hide */
			@UnsupportedAppUsage
	public Bitmap getIcon() {		public Bitmap getIcon() {
	return mIcon;		return mIcon;
	}		}