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

config/hiddenapi-light-greylist.txt

+0 −125

Original line number	Diff line number	Diff line
		@@ -214,14 +214,6 @@ Landroid/app/PackageDeleteObserver;-><init>()V
		Landroid/app/PackageInstallObserver;-><init>()V
		Landroid/app/ResourcesManager$ActivityResources;-><init>()V
		Landroid/app/ResourcesManager;-><init>()V
		Landroid/app/servertransaction/ActivityResultItem;->mResultInfoList:Ljava/util/List;
		Landroid/app/servertransaction/ClientTransaction;->getActivityToken()Landroid/os/IBinder;
		Landroid/app/servertransaction/ClientTransaction;->getCallbacks()Ljava/util/List;
		Landroid/app/servertransaction/ClientTransaction;->getLifecycleStateRequest()Landroid/app/servertransaction/ActivityLifecycleItem;
		Landroid/app/servertransaction/ClientTransaction;->mActivityCallbacks:Ljava/util/List;
		Landroid/app/servertransaction/LaunchActivityItem;->mInfo:Landroid/content/pm/ActivityInfo;
		Landroid/app/servertransaction/LaunchActivityItem;->mIntent:Landroid/content/Intent;
		Landroid/app/servertransaction/NewIntentItem;->mIntents:Ljava/util/List;
		Landroid/app/TaskStackListener;-><init>()V
		Landroid/app/trust/ITrustManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
		Landroid/app/UiAutomationConnection;-><init>()V
		@@ -426,9 +418,6 @@ Landroid/content/UndoManager;-><init>()V
		Landroid/database/IContentObserver$Stub;-><init>()V
		Landroid/database/IContentObserver$Stub;->asInterface(Landroid/os/IBinder;)Landroid/database/IContentObserver;
		Landroid/database/IContentObserver;->onChange(ZLandroid/net/Uri;I)V
		Landroid/graphics/ColorMatrixColorFilter;->setColorMatrixArray([F)V
		Landroid/graphics/FontFamily;->mNativePtr:J
		Landroid/graphics/FontListParser;->parse(Ljava/io/InputStream;)Landroid/text/FontConfig;
		Landroid/hardware/camera2/CameraCharacteristics;->CONTROL_AVAILABLE_HIGH_SPEED_VIDEO_CONFIGURATIONS:Landroid/hardware/camera2/CameraCharacteristics$Key;
		Landroid/hardware/camera2/CameraCharacteristics;->CONTROL_MAX_REGIONS:Landroid/hardware/camera2/CameraCharacteristics$Key;
		Landroid/hardware/camera2/CameraCharacteristics;->DEPTH_AVAILABLE_DEPTH_MIN_FRAME_DURATIONS:Landroid/hardware/camera2/CameraCharacteristics$Key;
		@@ -818,20 +807,6 @@ Landroid/os/Handler;->hasCallbacks(Ljava/lang/Runnable;)Z
		Landroid/os/Handler;->mCallback:Landroid/os/Handler$Callback;
		Landroid/os/Handler;->mLooper:Landroid/os/Looper;
		Landroid/os/Handler;->mMessenger:Landroid/os/IMessenger;
		Landroid/os/health/HealthKeys$Constants;-><init>(Ljava/lang/Class;)V
		Landroid/os/health/HealthStats;-><init>(Landroid/os/Parcel;)V
		Landroid/os/health/HealthStatsParceler;-><init>(Landroid/os/health/HealthStatsWriter;)V
		Landroid/os/health/HealthStatsParceler;-><init>(Landroid/os/Parcel;)V
		Landroid/os/health/HealthStatsParceler;->getHealthStats()Landroid/os/health/HealthStats;
		Landroid/os/health/HealthStatsWriter;-><init>(Landroid/os/health/HealthKeys$Constants;)V
		Landroid/os/health/HealthStatsWriter;->addMeasurement(IJ)V
		Landroid/os/health/HealthStatsWriter;->addMeasurements(ILjava/lang/String;J)V
		Landroid/os/health/HealthStatsWriter;->addStats(ILjava/lang/String;Landroid/os/health/HealthStatsWriter;)V
		Landroid/os/health/HealthStatsWriter;->addTimer(IIJ)V
		Landroid/os/health/HealthStatsWriter;->addTimers(ILjava/lang/String;Landroid/os/health/TimerStat;)V
		Landroid/os/health/HealthStatsWriter;->flattenToParcel(Landroid/os/Parcel;)V
		Landroid/os/health/SystemHealthManager;-><init>()V
		Landroid/os/health/SystemHealthManager;->from(Landroid/content/Context;)Landroid/os/health/SystemHealthManager;
		Landroid/os/HwParcel;-><init>(Z)V
		Landroid/os/HwRemoteBinder;-><init>()V
		Landroid/os/IBatteryPropertiesRegistrar$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
		@@ -1019,99 +994,10 @@ Landroid/os/ServiceSpecificException;-><init>(ILjava/lang/String;)V
		Landroid/os/SharedMemory;->getFd()I
		Landroid/os/ShellCommand;->peekNextArg()Ljava/lang/String;
		Landroid/os/StatFs;->mStat:Landroid/system/StructStatVfs;
		Landroid/os/storage/DiskInfo;-><init>(Landroid/os/Parcel;)V
		Landroid/os/storage/DiskInfo;->CREATOR:Landroid/os/Parcelable$Creator;
		Landroid/os/storage/DiskInfo;->flags:I
		Landroid/os/storage/DiskInfo;->getDescription()Ljava/lang/String;
		Landroid/os/storage/DiskInfo;->isAdoptable()Z
		Landroid/os/storage/DiskInfo;->isDefaultPrimary()Z
		Landroid/os/storage/DiskInfo;->isSd()Z
		Landroid/os/storage/DiskInfo;->isUsb()Z
		Landroid/os/storage/DiskInfo;->label:Ljava/lang/String;
		Landroid/os/storage/DiskInfo;->size:J
		Landroid/os/storage/IObbActionListener$Stub;-><init>()V
		Landroid/os/storage/IObbActionListener$Stub;->asInterface(Landroid/os/IBinder;)Landroid/os/storage/IObbActionListener;
		Landroid/os/storage/IStorageManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
		Landroid/os/storage/IStorageManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/os/storage/IStorageManager;
		Landroid/os/storage/StorageEventListener;->onDiskDestroyed(Landroid/os/storage/DiskInfo;)V
		Landroid/os/storage/StorageEventListener;->onDiskScanned(Landroid/os/storage/DiskInfo;I)V
		Landroid/os/storage/StorageEventListener;->onStorageStateChanged(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
		Landroid/os/storage/StorageEventListener;->onUsbMassStorageConnectionChanged(Z)V
		Landroid/os/storage/StorageEventListener;->onVolumeForgotten(Ljava/lang/String;)V
		Landroid/os/storage/StorageEventListener;->onVolumeRecordChanged(Landroid/os/storage/VolumeRecord;)V
		Landroid/os/storage/StorageEventListener;->onVolumeStateChanged(Landroid/os/storage/VolumeInfo;II)V
		Landroid/os/storage/StorageManager;-><init>(Landroid/content/Context;Landroid/os/Looper;)V
		Landroid/os/storage/StorageManager;->CRYPT_TYPE_DEFAULT:I
		Landroid/os/storage/StorageManager;->CRYPT_TYPE_PASSWORD:I
		Landroid/os/storage/StorageManager;->disableUsbMassStorage()V
		Landroid/os/storage/StorageManager;->enableUsbMassStorage()V
		Landroid/os/storage/StorageManager;->ENCRYPTION_STATE_NONE:I
		Landroid/os/storage/StorageManager;->findDiskById(Ljava/lang/String;)Landroid/os/storage/DiskInfo;
		Landroid/os/storage/StorageManager;->findEmulatedForPrivate(Landroid/os/storage/VolumeInfo;)Landroid/os/storage/VolumeInfo;
		Landroid/os/storage/StorageManager;->findVolumeByUuid(Ljava/lang/String;)Landroid/os/storage/VolumeInfo;
		Landroid/os/storage/StorageManager;->format(Ljava/lang/String;)V
		Landroid/os/storage/StorageManager;->getBestVolumeDescription(Landroid/os/storage/VolumeInfo;)Ljava/lang/String;
		Landroid/os/storage/StorageManager;->getDisks()Ljava/util/List;
		Landroid/os/storage/StorageManager;->getPrimaryPhysicalVolume()Landroid/os/storage/VolumeInfo;
		Landroid/os/storage/StorageManager;->getStorageBytesUntilLow(Ljava/io/File;)J
		Landroid/os/storage/StorageManager;->getStorageFullBytes(Ljava/io/File;)J
		Landroid/os/storage/StorageManager;->getStorageLowBytes(Ljava/io/File;)J
		Landroid/os/storage/StorageManager;->getStorageVolume([Landroid/os/storage/StorageVolume;Ljava/io/File;)Landroid/os/storage/StorageVolume;
		Landroid/os/storage/StorageManager;->getVolumeList(II)[Landroid/os/storage/StorageVolume;
		Landroid/os/storage/StorageManager;->getVolumePaths()[Ljava/lang/String;
		Landroid/os/storage/StorageManager;->getVolumes()Ljava/util/List;
		Landroid/os/storage/StorageManager;->getVolumeState(Ljava/lang/String;)Ljava/lang/String;
		Landroid/os/storage/StorageManager;->isFileEncryptedNativeOnly()Z
		Landroid/os/storage/StorageManager;->isUsbMassStorageConnected()Z
		Landroid/os/storage/StorageManager;->isUsbMassStorageEnabled()Z
		Landroid/os/storage/StorageManager;->partitionPublic(Ljava/lang/String;)V
		Landroid/os/storage/StorageManager;->unmount(Ljava/lang/String;)V
		Landroid/os/storage/StorageVolume;->allowMassStorage()Z
		Landroid/os/storage/StorageVolume;->getFatVolumeId()I
		Landroid/os/storage/StorageVolume;->getMaxFileSize()J
		Landroid/os/storage/StorageVolume;->getOwner()Landroid/os/UserHandle;
		Landroid/os/storage/StorageVolume;->getPath()Ljava/lang/String;
		Landroid/os/storage/StorageVolume;->getPathFile()Ljava/io/File;
		Landroid/os/storage/StorageVolume;->getUserLabel()Ljava/lang/String;
		Landroid/os/storage/StorageVolume;->mDescription:Ljava/lang/String;
		Landroid/os/storage/StorageVolume;->mId:Ljava/lang/String;
		Landroid/os/storage/StorageVolume;->mPath:Ljava/io/File;
		Landroid/os/storage/StorageVolume;->mPrimary:Z
		Landroid/os/storage/StorageVolume;->mRemovable:Z
		Landroid/os/storage/VolumeInfo;-><init>(Landroid/os/Parcel;)V
		Landroid/os/storage/VolumeInfo;->buildBrowseIntent()Landroid/content/Intent;
		Landroid/os/storage/VolumeInfo;->buildStableMtpStorageId(Ljava/lang/String;)I
		Landroid/os/storage/VolumeInfo;->buildStorageVolume(Landroid/content/Context;IZ)Landroid/os/storage/StorageVolume;
		Landroid/os/storage/VolumeInfo;->CREATOR:Landroid/os/Parcelable$Creator;
		Landroid/os/storage/VolumeInfo;->disk:Landroid/os/storage/DiskInfo;
		Landroid/os/storage/VolumeInfo;->fsLabel:Ljava/lang/String;
		Landroid/os/storage/VolumeInfo;->fsUuid:Ljava/lang/String;
		Landroid/os/storage/VolumeInfo;->getDescription()Ljava/lang/String;
		Landroid/os/storage/VolumeInfo;->getDisk()Landroid/os/storage/DiskInfo;
		Landroid/os/storage/VolumeInfo;->getDiskId()Ljava/lang/String;
		Landroid/os/storage/VolumeInfo;->getEnvironmentForState(I)Ljava/lang/String;
		Landroid/os/storage/VolumeInfo;->getFsUuid()Ljava/lang/String;
		Landroid/os/storage/VolumeInfo;->getInternalPath()Ljava/io/File;
		Landroid/os/storage/VolumeInfo;->getInternalPathForUser(I)Ljava/io/File;
		Landroid/os/storage/VolumeInfo;->getMountUserId()I
		Landroid/os/storage/VolumeInfo;->getPath()Ljava/io/File;
		Landroid/os/storage/VolumeInfo;->getPathForUser(I)Ljava/io/File;
		Landroid/os/storage/VolumeInfo;->getState()I
		Landroid/os/storage/VolumeInfo;->getType()I
		Landroid/os/storage/VolumeInfo;->internalPath:Ljava/lang/String;
		Landroid/os/storage/VolumeInfo;->isMountedReadable()Z
		Landroid/os/storage/VolumeInfo;->isMountedWritable()Z
		Landroid/os/storage/VolumeInfo;->isPrimary()Z
		Landroid/os/storage/VolumeInfo;->isPrimaryPhysical()Z
		Landroid/os/storage/VolumeInfo;->isVisible()Z
		Landroid/os/storage/VolumeInfo;->isVisibleForWrite(I)Z
		Landroid/os/storage/VolumeInfo;->path:Ljava/lang/String;
		Landroid/os/storage/VolumeInfo;->state:I
		Landroid/os/storage/VolumeInfo;->type:I
		Landroid/os/storage/VolumeInfo;->TYPE_EMULATED:I
		Landroid/os/storage/VolumeInfo;->TYPE_PUBLIC:I
		Landroid/os/storage/VolumeRecord;-><init>(Landroid/os/Parcel;)V
		Landroid/os/storage/VolumeRecord;->CREATOR:Landroid/os/Parcelable$Creator;
		Landroid/os/StrictMode$Span;->finish()V
		Landroid/os/StrictMode$ThreadPolicy;->mask:I
		Landroid/os/StrictMode$VmPolicy$Builder;->mMask:I
		@@ -1628,17 +1514,6 @@ Landroid/system/OsConstants;->_LINUX_CAPABILITY_VERSION_3:I
		Landroid/system/StructTimeval;->fromMillis(J)Landroid/system/StructTimeval;
		Landroid/telephony/CarrierMessagingServiceManager;-><init>()V
		Landroid/telephony/TelephonyManager$MultiSimVariants;->values()[Landroid/telephony/TelephonyManager$MultiSimVariants;
		Landroid/transition/ChangeBounds;->BOTTOM_RIGHT_ONLY_PROPERTY:Landroid/util/Property;
		Landroid/transition/ChangeBounds;->POSITION_PROPERTY:Landroid/util/Property;
		Landroid/transition/Scene;->mEnterAction:Ljava/lang/Runnable;
		Landroid/transition/Scene;->mExitAction:Ljava/lang/Runnable;
		Landroid/transition/Scene;->setCurrentScene(Landroid/view/View;Landroid/transition/Scene;)V
		Landroid/transition/Transition;->cancel()V
		Landroid/transition/Transition;->end()V
		Landroid/transition/Transition;->getRunningAnimators()Landroid/util/ArrayMap;
		Landroid/transition/TransitionManager;->getRunningTransitions()Landroid/util/ArrayMap;
		Landroid/transition/TransitionManager;->sPendingTransitions:Ljava/util/ArrayList;
		Landroid/transition/TransitionManager;->sRunningTransitions:Ljava/lang/ThreadLocal;
		Landroid/util/Singleton;-><init>()V
		Landroid/view/accessibility/IAccessibilityInteractionConnectionCallback;->setFindAccessibilityNodeInfoResult(Landroid/view/accessibility/AccessibilityNodeInfo;I)V
		Landroid/view/accessibility/IAccessibilityInteractionConnectionCallback;->setFindAccessibilityNodeInfosResult(Ljava/util/List;I)V

config/hiddenapi-vendor-list.txt

+0 −7

Original line number	Diff line number	Diff line
		@@ -114,14 +114,7 @@ Landroid/os/RegistrantList;->remove(Landroid/os/Handler;)V
		Landroid/os/RegistrantList;->removeCleared()V
		Landroid/os/RemoteException;->rethrowFromSystemServer()Ljava/lang/RuntimeException;
		Landroid/os/ServiceSpecificException;->errorCode:I
		Landroid/os/storage/DiskInfo;->getId()Ljava/lang/String;
		Landroid/os/storage/StorageEventListener;-><init>()V
		Landroid/os/storage/StorageManager;->findVolumeById(Ljava/lang/String;)Landroid/os/storage/VolumeInfo;
		Landroid/os/storage/StorageManager;->from(Landroid/content/Context;)Landroid/os/storage/StorageManager;
		Landroid/os/storage/StorageManager;->registerListener(Landroid/os/storage/StorageEventListener;)V
		Landroid/os/storage/StorageManager;->unregisterListener(Landroid/os/storage/StorageEventListener;)V
		Landroid/os/storage/StorageVolume;->getId()Ljava/lang/String;
		Landroid/os/storage/VolumeInfo;->getId()Ljava/lang/String;
		Landroid/os/SystemProperties;->reportSyspropChanged()V
		Landroid/os/SystemService;->start(Ljava/lang/String;)V
		Landroid/os/SystemService;->stop(Ljava/lang/String;)V

core/java/android/app/servertransaction/ActivityResultItem.java

+2 −0

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

		import static android.os.Trace.TRACE_TAG_ACTIVITY_MANAGER;

		import android.annotation.UnsupportedAppUsage;
		import android.app.ClientTransactionHandler;
		import android.app.ResultInfo;
		import android.os.IBinder;
		@@ -34,6 +35,7 @@ import java.util.Objects;
		*/
		public class ActivityResultItem extends ClientTransactionItem {

		@UnsupportedAppUsage
		private List<ResultInfo> mResultInfoList;

		/* TODO(b/78294732)

core/java/android/app/servertransaction/ClientTransaction.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		package android.app.servertransaction;

		import android.annotation.Nullable;
		import android.annotation.UnsupportedAppUsage;
		import android.app.ClientTransactionHandler;
		import android.app.IApplicationThread;
		import android.os.IBinder;
		@@ -42,6 +43,7 @@ import java.util.Objects;
		public class ClientTransaction implements Parcelable, ObjectPoolItem {

		/** A list of individual callbacks to a client. */
		@UnsupportedAppUsage
		private List<ClientTransactionItem> mActivityCallbacks;

		/**
		@@ -74,18 +76,21 @@ public class ClientTransaction implements Parcelable, ObjectPoolItem {

		/** Get the list of callbacks. */
		@Nullable
		@UnsupportedAppUsage
		List<ClientTransactionItem> getCallbacks() {
		return mActivityCallbacks;
		}

		/** Get the target activity. */
		@Nullable
		@UnsupportedAppUsage
		public IBinder getActivityToken() {
		return mActivityToken;
		}

		/** Get the target state lifecycle request. */
		@VisibleForTesting
		@UnsupportedAppUsage
		public ActivityLifecycleItem getLifecycleStateRequest() {
		return mLifecycleStateRequest;
		}

core/java/android/app/servertransaction/LaunchActivityItem.java

+3 −0

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

		import static android.os.Trace.TRACE_TAG_ACTIVITY_MANAGER;

		import android.annotation.UnsupportedAppUsage;
		import android.app.ActivityThread.ActivityClientRecord;
		import android.app.ClientTransactionHandler;
		import android.app.ProfilerInfo;
		@@ -45,8 +46,10 @@ import java.util.Objects;
		*/
		public class LaunchActivityItem extends ClientTransactionItem {

		@UnsupportedAppUsage
		private Intent mIntent;
		private int mIdent;
		@UnsupportedAppUsage
		private ActivityInfo mInfo;
		private Configuration mCurConfig;
		private Configuration mOverrideConfig;