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

config/hiddenapi-light-greylist.txt

+0 −744

File changed.

Preview size limit exceeded, changes collapsed.

config/hiddenapi-vendor-list.txt

+0 −40

Original line number	Diff line number	Diff line
		Landroid/app/Activity;->managedQuery(Landroid/net/Uri;[Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Landroid/database/Cursor;
		Landroid/app/Activity;->registerRemoteAnimations(Landroid/view/RemoteAnimationDefinition;)V
		Landroid/app/ActivityManager$RecentTaskInfo;->configuration:Landroid/content/res/Configuration;
		Landroid/app/ActivityManager$TaskDescription;->loadTaskDescriptionIcon(Ljava/lang/String;I)Landroid/graphics/Bitmap;
		Landroid/app/ActivityManager$TaskSnapshot;->getSnapshot()Landroid/graphics/GraphicBuffer;
		Landroid/app/ActivityManagerNative;->broadcastStickyIntent(Landroid/content/Intent;Ljava/lang/String;I)V
		Landroid/app/ActivityOptions;->makeRemoteAnimation(Landroid/view/RemoteAnimationAdapter;)Landroid/app/ActivityOptions;
		Landroid/app/ActivityOptions;->setSplitScreenCreateMode(I)V
		Landroid/app/ActivityView;-><init>(Landroid/content/Context;)V
		Landroid/app/ActivityView;->release()V
		Landroid/app/ActivityView;->startActivity(Landroid/app/PendingIntent;)V
		Landroid/app/ActivityView;->startActivity(Landroid/content/Intent;)V
		Landroid/app/AppOpsManager$OpEntry;->getOp()I
		Landroid/app/AppOpsManager$OpEntry;->getTime()J
		Landroid/app/AppOpsManager$OpEntry;->isRunning()Z
		Landroid/app/AppOpsManager$PackageOps;->getOps()Ljava/util/List;
		Landroid/app/AppOpsManager$PackageOps;->getPackageName()Ljava/lang/String;
		Landroid/app/AppOpsManager$PackageOps;->getUid()I
		Landroid/app/AppOpsManager;->getPackagesForOps([I)Ljava/util/List;
		Landroid/app/AppOpsManager;->getToken(Lcom/android/internal/app/IAppOpsService;)Landroid/os/IBinder;
		Landroid/app/IActivityController$Stub;-><init>()V
		Landroid/app/IActivityManager;->cancelRecentsAnimation(Z)V
		Landroid/app/IActivityManager;->cancelTaskWindowTransition(I)V
		@@ -39,27 +19,7 @@ Landroid/app/IAlarmManager;->setTime(J)Z
		Landroid/app/IAssistDataReceiver$Stub;-><init>()V
		Landroid/app/IAssistDataReceiver;->onHandleAssistData(Landroid/os/Bundle;)V
		Landroid/app/IAssistDataReceiver;->onHandleAssistScreenshot(Landroid/graphics/Bitmap;)V
		Landroid/app/KeyguardManager;->isDeviceLocked(I)Z
		Landroid/app/NotificationManager;->cancelAsUser(Ljava/lang/String;ILandroid/os/UserHandle;)V
		Landroid/app/StatusBarManager;->removeIcon(Ljava/lang/String;)V
		Landroid/app/StatusBarManager;->setIcon(Ljava/lang/String;IILjava/lang/String;)V
		Landroid/app/TaskStackListener;->onActivityDismissingDockedStack()V
		Landroid/app/TaskStackListener;->onActivityForcedResizable(Ljava/lang/String;II)V
		Landroid/app/TaskStackListener;->onActivityLaunchOnSecondaryDisplayFailed()V
		Landroid/app/TaskStackListener;->onActivityPinned(Ljava/lang/String;III)V
		Landroid/app/TaskStackListener;->onActivityRequestedOrientationChanged(II)V
		Landroid/app/TaskStackListener;->onActivityUnpinned()V
		Landroid/app/TaskStackListener;->onPinnedActivityRestartAttempt(Z)V
		Landroid/app/TaskStackListener;->onPinnedStackAnimationEnded()V
		Landroid/app/TaskStackListener;->onPinnedStackAnimationStarted()V
		Landroid/app/TaskStackListener;->onTaskMovedToFront(I)V
		Landroid/app/TaskStackListener;->onTaskProfileLocked(II)V
		Landroid/app/TaskStackListener;->onTaskRemoved(I)V
		Landroid/app/TaskStackListener;->onTaskSnapshotChanged(ILandroid/app/ActivityManager$TaskSnapshot;)V
		Landroid/app/TaskStackListener;->onTaskStackChanged()V
		Landroid/app/VrStateCallback;-><init>()V
		Landroid/app/VrStateCallback;->onPersistentVrStateChanged(Z)V
		Landroid/app/WallpaperColors;-><init>(Landroid/graphics/Color;Landroid/graphics/Color;Landroid/graphics/Color;I)V
		Landroid/bluetooth/IBluetooth;->sendConnectionStateChange(Landroid/bluetooth/BluetoothDevice;III)V
		Landroid/companion/ICompanionDeviceDiscoveryService$Stub;-><init>()V
		Landroid/companion/ICompanionDeviceDiscoveryServiceCallback;->onDeviceSelected(Ljava/lang/String;ILjava/lang/String;)V

core/java/android/app/ActionBar.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@ import android.annotation.LayoutRes;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.StringRes;
		import android.annotation.UnsupportedAppUsage;
		import android.content.Context;
		import android.content.res.Configuration;
		import android.content.res.TypedArray;
		@@ -210,6 +211,7 @@ public abstract class ActionBar {
		* Allow the title to wrap onto multiple lines if space is available
		* @hide pending API approval
		*/
		@UnsupportedAppUsage
		public static final int DISPLAY_TITLE_MULTIPLE_LINES = 0x20;

		/**
		@@ -1050,6 +1052,7 @@ public abstract class ActionBar {
		}

		/** @hide */
		@UnsupportedAppUsage
		public void setShowHideAnimationEnabled(boolean enabled) {
		}

		@@ -1092,6 +1095,7 @@ public abstract class ActionBar {
		}

		/** @hide */
		@UnsupportedAppUsage
		public boolean collapseActionView() {
		return false;
		}

core/java/android/app/Activity.java

+48 −0

Original line number	Diff line number	Diff line
		@@ -31,6 +31,7 @@ import android.annotation.Nullable;
		import android.annotation.RequiresPermission;
		import android.annotation.StyleRes;
		import android.annotation.SystemApi;
		import android.annotation.UnsupportedAppUsage;
		import android.app.VoiceInteractor.Request;
		import android.app.admin.DevicePolicyManager;
		import android.app.assist.AssistContent;
		@@ -735,6 +736,7 @@ public class Activity extends ContextThemeWrapper
		*/
		public static final int FINISH_TASK_WITH_ACTIVITY = 2;

		@UnsupportedAppUsage
		static final String FRAGMENTS_TAG = "android:fragments";
		private static final String LAST_AUTOFILL_ID = "android:lastAutofillId";

		@@ -768,22 +770,38 @@ public class Activity extends ContextThemeWrapper
		private SparseArray<ManagedDialog> mManagedDialogs;

		// set by the thread after the constructor and before onCreate(Bundle savedInstanceState) is called.
		@UnsupportedAppUsage
		private Instrumentation mInstrumentation;
		@UnsupportedAppUsage
		private IBinder mToken;
		@UnsupportedAppUsage
		private int mIdent;
		@UnsupportedAppUsage
		/package/ String mEmbeddedID;
		@UnsupportedAppUsage
		private Application mApplication;
		@UnsupportedAppUsage
		/package/ Intent mIntent;
		@UnsupportedAppUsage
		/package/ String mReferrer;
		@UnsupportedAppUsage
		private ComponentName mComponent;
		@UnsupportedAppUsage
		/package/ ActivityInfo mActivityInfo;
		@UnsupportedAppUsage
		/package/ ActivityThread mMainThread;
		@UnsupportedAppUsage
		Activity mParent;
		@UnsupportedAppUsage
		boolean mCalled;
		@UnsupportedAppUsage
		/package/ boolean mResumed;
		@UnsupportedAppUsage
		/package/ boolean mStopped;
		@UnsupportedAppUsage
		boolean mFinished;
		boolean mStartedActivity;
		@UnsupportedAppUsage
		private boolean mDestroyed;
		private boolean mDoReportFullyDrawn = true;
		private boolean mRestoredFromBundle;
		@@ -795,7 +813,9 @@ public class Activity extends ContextThemeWrapper
		/package/ boolean mTemporaryPause = false;
		/** true if the activity is being destroyed in order to recreate it with a new configuration */
		/package/ boolean mChangingConfigurations = false;
		@UnsupportedAppUsage
		/package/ int mConfigChangeFlags;
		@UnsupportedAppUsage
		/package/ Configuration mCurrentConfig;
		private SearchManager mSearchManager;
		private MenuInflater mMenuInflater;
		@@ -810,25 +830,34 @@ public class Activity extends ContextThemeWrapper
		ArrayMap<String, LoaderManager> loaders;
		VoiceInteractor voiceInteractor;
		}
		@UnsupportedAppUsage
		/* package */ NonConfigurationInstances mLastNonConfigurationInstances;

		@UnsupportedAppUsage
		private Window mWindow;

		@UnsupportedAppUsage
		private WindowManager mWindowManager;
		/package/ View mDecor = null;
		@UnsupportedAppUsage
		/package/ boolean mWindowAdded = false;
		/package/ boolean mVisibleFromServer = false;
		@UnsupportedAppUsage
		/package/ boolean mVisibleFromClient = true;
		/package/ ActionBar mActionBar = null;
		private boolean mEnableDefaultActionBarUp;

		@UnsupportedAppUsage
		private VoiceInteractor mVoiceInteractor;

		@UnsupportedAppUsage
		private CharSequence mTitle;
		private int mTitleColor = 0;

		// we must have a handler before the FragmentController is constructed
		@UnsupportedAppUsage
		final Handler mHandler = new Handler();
		@UnsupportedAppUsage
		final FragmentController mFragments = FragmentController.createController(new HostCallbacks());

		private static final class ManagedCursor {
		@@ -847,8 +876,10 @@ public class Activity extends ContextThemeWrapper
		private final ArrayList<ManagedCursor> mManagedCursors = new ArrayList<>();

		@GuardedBy("this")
		@UnsupportedAppUsage
		int mResultCode = RESULT_CANCELED;
		@GuardedBy("this")
		@UnsupportedAppUsage
		Intent mResultData = null;

		private TranslucentConversionListener mTranslucentCallback;
		@@ -872,6 +903,7 @@ public class Activity extends ContextThemeWrapper

		private Thread mUiThread;

		@UnsupportedAppUsage
		ActivityTransitionState mActivityTransitionState = new ActivityTransitionState();
		SharedElementCallback mEnterTransitionListener = SharedElementCallback.NULL_CALLBACK;
		SharedElementCallback mExitTransitionListener = SharedElementCallback.NULL_CALLBACK;
		@@ -1657,6 +1689,7 @@ public class Activity extends ContextThemeWrapper
		*
		* @param outState place to store the saved state.
		*/
		@UnsupportedAppUsage
		private void saveManagedDialogs(Bundle outState) {
		if (mManagedDialogs == null) {
		return;
		@@ -2514,6 +2547,7 @@ public class Activity extends ContextThemeWrapper
		* @deprecated Use {@link CursorLoader} instead.
		*/
		@Deprecated
		@UnsupportedAppUsage
		public final Cursor managedQuery(Uri uri, String[] projection, String selection,
		String sortOrder) {
		Cursor c = getContentResolver().query(uri, projection, selection, null, sortOrder);
		@@ -2634,6 +2668,7 @@ public class Activity extends ContextThemeWrapper
		* @hide
		*/
		@Deprecated
		@UnsupportedAppUsage
		public void setPersistent(boolean isPersistent) {
		}

		@@ -4656,6 +4691,7 @@ public class Activity extends ContextThemeWrapper
		/**
		* @hide Implement to provide correct calling token.
		*/
		@UnsupportedAppUsage
		public void startActivityForResultAsUser(Intent intent, int requestCode, UserHandle user) {
		startActivityForResultAsUser(intent, requestCode, null, user);
		}
		@@ -4701,6 +4737,7 @@ public class Activity extends ContextThemeWrapper
		/**
		* @hide Implement to provide correct calling token.
		*/
		@UnsupportedAppUsage
		public void startActivityAsUser(Intent intent, UserHandle user) {
		startActivityAsUser(intent, null, user);
		}
		@@ -5264,6 +5301,7 @@ public class Activity extends ContextThemeWrapper
		* @hide
		*/
		@Override
		@UnsupportedAppUsage
		public void startActivityForResult(
		String who, Intent intent, int requestCode, @Nullable Bundle options) {
		Uri referrer = onProvideReferrer();
		@@ -5590,6 +5628,7 @@ public class Activity extends ContextThemeWrapper
		* Finishes the current activity and specifies whether to remove the task associated with this
		* activity.
		*/
		@UnsupportedAppUsage
		private void finish(int finishTask) {
		if (mParent == null) {
		int resultCode;
		@@ -6516,6 +6555,7 @@ public class Activity extends ContextThemeWrapper
		* @return The ActivityOptions passed to {@link #convertToTranslucent}.
		* @hide
		*/
		@UnsupportedAppUsage
		ActivityOptions getActivityOptions() {
		try {
		return ActivityOptions.fromBundle(
		@@ -7037,10 +7077,12 @@ public class Activity extends ContextThemeWrapper

		// ------------------ Internal API ------------------

		@UnsupportedAppUsage
		final void setParent(Activity parent) {
		mParent = parent;
		}

		@UnsupportedAppUsage
		final void attach(Context context, ActivityThread aThread,
		Instrumentation instr, IBinder token, int ident,
		Application application, Intent intent, ActivityInfo info,
		@@ -7113,6 +7155,7 @@ public class Activity extends ContextThemeWrapper
		}

		/** @hide */
		@UnsupportedAppUsage
		public final IBinder getActivityToken() {
		return mParent != null ? mParent.getActivityToken() : mToken;
		}
		@@ -7127,6 +7170,7 @@ public class Activity extends ContextThemeWrapper
		performCreate(icicle, null);
		}

		@UnsupportedAppUsage
		final void performCreate(Bundle icicle, PersistableBundle persistentState) {
		mCanEnterPictureInPicture = true;
		restoreHasCurrentPermissionRequest(icicle);
		@@ -7427,6 +7471,7 @@ public class Activity extends ContextThemeWrapper
		/**
		* @hide
		*/
		@UnsupportedAppUsage
		public final boolean isResumed() {
		return mResumed;
		}
		@@ -7444,6 +7489,7 @@ public class Activity extends ContextThemeWrapper
		}
		}

		@UnsupportedAppUsage
		void dispatchActivityResult(String who, int requestCode, int resultCode, Intent data,
		String reason) {
		if (false) Log.v(
		@@ -7811,6 +7857,7 @@ public class Activity extends ContextThemeWrapper
		* @param disable {@code true} to disable preview screenshots; {@code false} otherwise.
		* @hide
		*/
		@UnsupportedAppUsage
		public void setDisablePreviewScreenshots(boolean disable) {
		try {
		ActivityManager.getService().setDisablePreviewScreenshots(mToken, disable);
		@@ -7874,6 +7921,7 @@ public class Activity extends ContextThemeWrapper
		* @hide
		*/
		@RequiresPermission(CONTROL_REMOTE_APP_TRANSITION_ANIMATIONS)
		@UnsupportedAppUsage
		public void registerRemoteAnimations(RemoteAnimationDefinition definition) {
		try {
		ActivityManager.getService().registerRemoteAnimations(mToken, definition);

core/java/android/app/ActivityGroup.java

+2 −0

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

		package android.app;

		import android.annotation.UnsupportedAppUsage;
		import android.content.Intent;
		import android.os.Bundle;

		@@ -37,6 +38,7 @@ public class ActivityGroup extends Activity {
		* This field should be made private, so it is hidden from the SDK.
		* {@hide}
		*/
		@UnsupportedAppUsage
		protected LocalActivityManager mLocalActivityManager;

		public ActivityGroup() {