diff options
19 files changed, 137 insertions, 118 deletions
diff --git a/config/hiddenapi-light-greylist.txt b/config/hiddenapi-light-greylist.txt index 6f06edc0b911..045814a3edf5 100644 --- a/config/hiddenapi-light-greylist.txt +++ b/config/hiddenapi-light-greylist.txt @@ -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,8 +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/hardware/biometrics/BiometricConstants;->BIOMETRIC_ERROR_VENDOR_BASE:I -Landroid/hardware/biometrics/BiometricFingerprintConstants;->FINGERPRINT_ERROR_VENDOR_BASE:I Landroid/hardware/display/IDisplayManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/hardware/display/IDisplayManager; Landroid/hardware/display/IDisplayManager;->getDisplayInfo(I)Landroid/view/DisplayInfo; Landroid/hardware/fingerprint/IFingerprintService$Stub$Proxy;-><init>(Landroid/os/IBinder;)V @@ -765,8 +755,6 @@ Landroid/os/Handler;->getPostMessage(Ljava/lang/Runnable;Ljava/lang/Object;)Land 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/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 @@ -950,98 +938,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;->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 @@ -1548,17 +1448,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 diff --git a/config/hiddenapi-vendor-list.txt b/config/hiddenapi-vendor-list.txt index 54cc07a878ed..02719e3f833f 100644 --- a/config/hiddenapi-vendor-list.txt +++ b/config/hiddenapi-vendor-list.txt @@ -113,14 +113,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 diff --git a/core/java/android/app/servertransaction/ActivityResultItem.java b/core/java/android/app/servertransaction/ActivityResultItem.java index e57f585d2022..bab17dc6b80f 100644 --- a/core/java/android/app/servertransaction/ActivityResultItem.java +++ b/core/java/android/app/servertransaction/ActivityResultItem.java @@ -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) diff --git a/core/java/android/app/servertransaction/ClientTransaction.java b/core/java/android/app/servertransaction/ClientTransaction.java index 2a33342836f7..f1d87ac02965 100644 --- a/core/java/android/app/servertransaction/ClientTransaction.java +++ b/core/java/android/app/servertransaction/ClientTransaction.java @@ -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; @@ -43,6 +44,7 @@ import java.util.Objects; public class ClientTransaction implements Parcelable, ObjectPoolItem { /** A list of individual callbacks to a client. */ + @UnsupportedAppUsage private List<ClientTransactionItem> mActivityCallbacks; /** @@ -75,18 +77,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; } diff --git a/core/java/android/app/servertransaction/LaunchActivityItem.java b/core/java/android/app/servertransaction/LaunchActivityItem.java index 6bae3595be4d..ed793bfae41a 100644 --- a/core/java/android/app/servertransaction/LaunchActivityItem.java +++ b/core/java/android/app/servertransaction/LaunchActivityItem.java @@ -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; diff --git a/core/java/android/app/servertransaction/NewIntentItem.java b/core/java/android/app/servertransaction/NewIntentItem.java index e5ce3b00c0fd..4f28cd2d58d7 100644 --- a/core/java/android/app/servertransaction/NewIntentItem.java +++ b/core/java/android/app/servertransaction/NewIntentItem.java @@ -16,6 +16,7 @@ package android.app.servertransaction; +import android.annotation.UnsupportedAppUsage; import android.app.ClientTransactionHandler; import android.os.IBinder; import android.os.Parcel; @@ -33,6 +34,7 @@ import java.util.Objects; */ public class NewIntentItem extends ClientTransactionItem { + @UnsupportedAppUsage private List<ReferrerIntent> mIntents; private boolean mPause; diff --git a/core/java/android/hardware/biometrics/BiometricConstants.java b/core/java/android/hardware/biometrics/BiometricConstants.java index 5cf8f457a08d..f83e847755b5 100644 --- a/core/java/android/hardware/biometrics/BiometricConstants.java +++ b/core/java/android/hardware/biometrics/BiometricConstants.java @@ -16,6 +16,8 @@ package android.hardware.biometrics; +import android.annotation.UnsupportedAppUsage; + /** * Interface containing all of the biometric modality agnostic constants. @@ -119,6 +121,7 @@ public interface BiometricConstants { /** * @hide */ + @UnsupportedAppUsage int BIOMETRIC_ERROR_VENDOR_BASE = 1000; // diff --git a/core/java/android/hardware/biometrics/BiometricFingerprintConstants.java b/core/java/android/hardware/biometrics/BiometricFingerprintConstants.java index d583d78333fb..041b2e673b96 100644 --- a/core/java/android/hardware/biometrics/BiometricFingerprintConstants.java +++ b/core/java/android/hardware/biometrics/BiometricFingerprintConstants.java @@ -16,6 +16,7 @@ package android.hardware.biometrics; +import android.annotation.UnsupportedAppUsage; import android.hardware.fingerprint.FingerprintManager; /** @@ -120,6 +121,7 @@ public interface BiometricFingerprintConstants { /** * @hide */ + @UnsupportedAppUsage public static final int FINGERPRINT_ERROR_VENDOR_BASE = 1000; // diff --git a/core/java/android/os/health/SystemHealthManager.java b/core/java/android/os/health/SystemHealthManager.java index bba4cd1fb8e4..f303674ce055 100644 --- a/core/java/android/os/health/SystemHealthManager.java +++ b/core/java/android/os/health/SystemHealthManager.java @@ -17,6 +17,7 @@ package android.os.health; import android.annotation.SystemService; +import android.annotation.UnsupportedAppUsage; import android.content.Context; import android.os.BatteryStats; import android.os.Process; @@ -49,6 +50,7 @@ public class SystemHealthManager { * Construct a new SystemHealthManager object. * @hide */ + @UnsupportedAppUsage public SystemHealthManager() { this(IBatteryStats.Stub.asInterface(ServiceManager.getService(BatteryStats.SERVICE_NAME))); } @@ -63,6 +65,7 @@ public class SystemHealthManager { * * @hide */ + @UnsupportedAppUsage public static SystemHealthManager from(Context context) { return (SystemHealthManager)context.getSystemService(Context.SYSTEM_HEALTH_SERVICE); } diff --git a/core/java/android/os/storage/DiskInfo.java b/core/java/android/os/storage/DiskInfo.java index d493ccebf531..7b6c97132b5c 100644 --- a/core/java/android/os/storage/DiskInfo.java +++ b/core/java/android/os/storage/DiskInfo.java @@ -18,6 +18,7 @@ package android.os.storage; import android.annotation.NonNull; import android.annotation.Nullable; +import android.annotation.UnsupportedAppUsage; import android.content.res.Resources; import android.os.Parcel; import android.os.Parcelable; @@ -50,8 +51,11 @@ public class DiskInfo implements Parcelable { public static final int FLAG_USB = 1 << 3; public final String id; + @UnsupportedAppUsage public final int flags; + @UnsupportedAppUsage public long size; + @UnsupportedAppUsage public String label; /** Hacky; don't rely on this count */ public int volumeCount; @@ -62,6 +66,7 @@ public class DiskInfo implements Parcelable { this.flags = flags; } + @UnsupportedAppUsage public DiskInfo(Parcel parcel) { id = parcel.readString(); flags = parcel.readInt(); @@ -71,6 +76,7 @@ public class DiskInfo implements Parcelable { sysPath = parcel.readString(); } + @UnsupportedAppUsage public @NonNull String getId() { return id; } @@ -94,6 +100,7 @@ public class DiskInfo implements Parcelable { return true; } + @UnsupportedAppUsage public @Nullable String getDescription() { final Resources res = Resources.getSystem(); if ((flags & FLAG_SD) != 0) { @@ -124,18 +131,22 @@ public class DiskInfo implements Parcelable { } } + @UnsupportedAppUsage public boolean isAdoptable() { return (flags & FLAG_ADOPTABLE) != 0; } + @UnsupportedAppUsage public boolean isDefaultPrimary() { return (flags & FLAG_DEFAULT_PRIMARY) != 0; } + @UnsupportedAppUsage public boolean isSd() { return (flags & FLAG_SD) != 0; } + @UnsupportedAppUsage public boolean isUsb() { return (flags & FLAG_USB) != 0; } @@ -185,6 +196,7 @@ public class DiskInfo implements Parcelable { return id.hashCode(); } + @UnsupportedAppUsage public static final Creator<DiskInfo> CREATOR = new Creator<DiskInfo>() { @Override public DiskInfo createFromParcel(Parcel in) { diff --git a/core/java/android/os/storage/StorageEventListener.java b/core/java/android/os/storage/StorageEventListener.java index 4cf83fda4e39..4aa0b08ae358 100644 --- a/core/java/android/os/storage/StorageEventListener.java +++ b/core/java/android/os/storage/StorageEventListener.java @@ -16,6 +16,8 @@ package android.os.storage; +import android.annotation.UnsupportedAppUsage; + /** * Used for receiving notifications from the StorageManager * @@ -26,6 +28,7 @@ public class StorageEventListener { * Called when the detection state of a USB Mass Storage host has changed. * @param connected true if the USB mass storage is connected. */ + @UnsupportedAppUsage public void onUsbMassStorageConnectionChanged(boolean connected) { } @@ -35,21 +38,27 @@ public class StorageEventListener { * @param oldState the old state as returned by {@link android.os.Environment#getExternalStorageState()}. * @param newState the old state as returned by {@link android.os.Environment#getExternalStorageState()}. */ + @UnsupportedAppUsage public void onStorageStateChanged(String path, String oldState, String newState) { } + @UnsupportedAppUsage public void onVolumeStateChanged(VolumeInfo vol, int oldState, int newState) { } + @UnsupportedAppUsage public void onVolumeRecordChanged(VolumeRecord rec) { } + @UnsupportedAppUsage public void onVolumeForgotten(String fsUuid) { } + @UnsupportedAppUsage public void onDiskScanned(DiskInfo disk, int volumeCount) { } + @UnsupportedAppUsage public void onDiskDestroyed(DiskInfo disk) { } } diff --git a/core/java/android/os/storage/StorageManager.java b/core/java/android/os/storage/StorageManager.java index 9724e8f96c0a..8d5017b4e176 100644 --- a/core/java/android/os/storage/StorageManager.java +++ b/core/java/android/os/storage/StorageManager.java @@ -25,6 +25,7 @@ import android.annotation.SdkConstant; import android.annotation.SuppressLint; import android.annotation.SystemApi; import android.annotation.SystemService; +import android.annotation.UnsupportedAppUsage; import android.annotation.WorkerThread; import android.app.Activity; import android.app.ActivityThread; @@ -232,6 +233,7 @@ public class StorageManager { public static final int FSTRIM_FLAG_DEEP = IVold.FSTRIM_FLAG_DEEP_TRIM; /** @hide The volume is not encrypted. */ + @UnsupportedAppUsage public static final int ENCRYPTION_STATE_NONE = IVold.ENCRYPTION_STATE_NONE; @@ -448,6 +450,7 @@ public class StorageManager { /** {@hide} */ @Deprecated + @UnsupportedAppUsage public static StorageManager from(Context context) { return context.getSystemService(StorageManager.class); } @@ -464,6 +467,7 @@ public class StorageManager { * * @hide */ + @UnsupportedAppUsage public StorageManager(Context context, Looper looper) throws ServiceNotFoundException { mContext = context; mResolver = context.getContentResolver(); @@ -478,6 +482,7 @@ public class StorageManager { * * @hide */ + @UnsupportedAppUsage public void registerListener(StorageEventListener listener) { synchronized (mDelegates) { final StorageEventListenerDelegate delegate = new StorageEventListenerDelegate(listener, @@ -498,6 +503,7 @@ public class StorageManager { * * @hide */ + @UnsupportedAppUsage public void unregisterListener(StorageEventListener listener) { synchronized (mDelegates) { for (Iterator<StorageEventListenerDelegate> i = mDelegates.iterator(); i.hasNext();) { @@ -520,6 +526,7 @@ public class StorageManager { * @hide */ @Deprecated + @UnsupportedAppUsage public void enableUsbMassStorage() { } @@ -529,6 +536,7 @@ public class StorageManager { * @hide */ @Deprecated + @UnsupportedAppUsage public void disableUsbMassStorage() { } @@ -539,6 +547,7 @@ public class StorageManager { * @hide */ @Deprecated + @UnsupportedAppUsage public boolean isUsbMassStorageConnected() { return false; } @@ -550,6 +559,7 @@ public class StorageManager { * @hide */ @Deprecated + @UnsupportedAppUsage public boolean isUsbMassStorageEnabled() { return false; } @@ -670,6 +680,7 @@ public class StorageManager { } /** {@hide} */ + @UnsupportedAppUsage public @NonNull List<DiskInfo> getDisks() { try { return Arrays.asList(mStorageManager.getDisks()); @@ -679,6 +690,7 @@ public class StorageManager { } /** {@hide} */ + @UnsupportedAppUsage public @Nullable DiskInfo findDiskById(String id) { Preconditions.checkNotNull(id); // TODO; go directly to service to make this faster @@ -691,6 +703,7 @@ public class StorageManager { } /** {@hide} */ + @UnsupportedAppUsage public @Nullable VolumeInfo findVolumeById(String id) { Preconditions.checkNotNull(id); // TODO; go directly to service to make this faster @@ -703,6 +716,7 @@ public class StorageManager { } /** {@hide} */ + @UnsupportedAppUsage public @Nullable VolumeInfo findVolumeByUuid(String fsUuid) { Preconditions.checkNotNull(fsUuid); // TODO; go directly to service to make this faster @@ -736,6 +750,7 @@ public class StorageManager { } /** {@hide} */ + @UnsupportedAppUsage public @Nullable VolumeInfo findEmulatedForPrivate(VolumeInfo privateVol) { if (privateVol != null) { return findVolumeById(privateVol.getId().replace("private", "emulated")); @@ -814,6 +829,7 @@ public class StorageManager { } /** {@hide} */ + @UnsupportedAppUsage public @NonNull List<VolumeInfo> getVolumes() { try { return Arrays.asList(mStorageManager.getVolumes(0)); @@ -847,6 +863,7 @@ public class StorageManager { } /** {@hide} */ + @UnsupportedAppUsage public @Nullable String getBestVolumeDescription(VolumeInfo vol) { if (vol == null) return null; @@ -870,6 +887,7 @@ public class StorageManager { } /** {@hide} */ + @UnsupportedAppUsage public @Nullable VolumeInfo getPrimaryPhysicalVolume() { final List<VolumeInfo> vols = getVolumes(); for (VolumeInfo vol : vols) { @@ -890,6 +908,7 @@ public class StorageManager { } /** {@hide} */ + @UnsupportedAppUsage public void unmount(String volId) { try { mStorageManager.unmount(volId); @@ -899,6 +918,7 @@ public class StorageManager { } /** {@hide} */ + @UnsupportedAppUsage public void format(String volId) { try { mStorageManager.format(volId); @@ -940,6 +960,7 @@ public class StorageManager { } /** {@hide} */ + @UnsupportedAppUsage public void partitionPublic(String diskId) { try { mStorageManager.partitionPublic(diskId); @@ -1069,6 +1090,7 @@ public class StorageManager { } /** {@hide} */ + @UnsupportedAppUsage private static @Nullable StorageVolume getStorageVolume(StorageVolume[] volumes, File file) { if (file == null) { return null; @@ -1098,6 +1120,7 @@ public class StorageManager { * @hide */ @Deprecated + @UnsupportedAppUsage public @NonNull String getVolumeState(String mountPoint) { final StorageVolume vol = getStorageVolume(new File(mountPoint)); if (vol != null) { @@ -1161,6 +1184,7 @@ public class StorageManager { } /** {@hide} */ + @UnsupportedAppUsage public static @NonNull StorageVolume[] getVolumeList(int userId, int flags) { final IStorageManager storageManager = IStorageManager.Stub.asInterface( ServiceManager.getService("mount")); @@ -1194,6 +1218,7 @@ public class StorageManager { * @hide */ @Deprecated + @UnsupportedAppUsage public @NonNull String[] getVolumePaths() { StorageVolume[] volumes = getVolumeList(); int count = volumes.length; @@ -1233,6 +1258,7 @@ public class StorageManager { * * @hide */ + @UnsupportedAppUsage public long getStorageBytesUntilLow(File path) { return path.getUsableSpace() - getStorageFullBytes(path); } @@ -1243,6 +1269,7 @@ public class StorageManager { * * @hide */ + @UnsupportedAppUsage public long getStorageLowBytes(File path) { final long lowPercent = Settings.Global.getInt(mResolver, Settings.Global.SYS_STORAGE_THRESHOLD_PERCENTAGE, DEFAULT_THRESHOLD_PERCENTAGE); @@ -1286,6 +1313,7 @@ public class StorageManager { * * @hide */ + @UnsupportedAppUsage public long getStorageFullBytes(File path) { return Settings.Global.getLong(mResolver, Settings.Global.SYS_STORAGE_FULL_THRESHOLD_BYTES, DEFAULT_FULL_THRESHOLD_BYTES); @@ -1402,6 +1430,7 @@ public class StorageManager { * @return true for file encrypted. (Implies isEncrypted() == true) * false not encrypted or block encrypted */ + @UnsupportedAppUsage public static boolean isFileEncryptedNativeOnly() { if (!isEncrypted()) { return false; @@ -2062,8 +2091,10 @@ public class StorageManager { /// Consts to match the password types in cryptfs.h /** @hide */ + @UnsupportedAppUsage public static final int CRYPT_TYPE_PASSWORD = IVold.PASSWORD_TYPE_PASSWORD; /** @hide */ + @UnsupportedAppUsage public static final int CRYPT_TYPE_DEFAULT = IVold.PASSWORD_TYPE_DEFAULT; /** @hide */ public static final int CRYPT_TYPE_PATTERN = IVold.PASSWORD_TYPE_PATTERN; diff --git a/core/java/android/os/storage/StorageVolume.java b/core/java/android/os/storage/StorageVolume.java index 9880142380c0..deff693a5cae 100644 --- a/core/java/android/os/storage/StorageVolume.java +++ b/core/java/android/os/storage/StorageVolume.java @@ -18,6 +18,7 @@ package android.os.storage; import android.annotation.Nullable; import android.annotation.TestApi; +import android.annotation.UnsupportedAppUsage; import android.content.Context; import android.content.Intent; import android.net.Uri; @@ -77,11 +78,16 @@ import java.io.File; // user, but is now part of the public API. public final class StorageVolume implements Parcelable { + @UnsupportedAppUsage private final String mId; + @UnsupportedAppUsage private final File mPath; private final File mInternalPath; + @UnsupportedAppUsage private final String mDescription; + @UnsupportedAppUsage private final boolean mPrimary; + @UnsupportedAppUsage private final boolean mRemovable; private final boolean mEmulated; private final boolean mAllowMassStorage; @@ -153,6 +159,7 @@ public final class StorageVolume implements Parcelable { } /** {@hide} */ + @UnsupportedAppUsage public String getId() { return mId; } @@ -179,6 +186,7 @@ public final class StorageVolume implements Parcelable { } /** {@hide} */ + @UnsupportedAppUsage public File getPathFile() { return mPath; } @@ -224,6 +232,7 @@ public final class StorageVolume implements Parcelable { * @return whether mass storage is allowed * @hide */ + @UnsupportedAppUsage public boolean allowMassStorage() { return mAllowMassStorage; } @@ -234,11 +243,13 @@ public final class StorageVolume implements Parcelable { * @return maximum file size * @hide */ + @UnsupportedAppUsage public long getMaxFileSize() { return mMaxFileSize; } /** {@hide} */ + @UnsupportedAppUsage public UserHandle getOwner() { return mOwner; } @@ -255,6 +266,7 @@ public final class StorageVolume implements Parcelable { * parse or UUID is unknown. * @hide */ + @UnsupportedAppUsage public int getFatVolumeId() { if (mFsUuid == null || mFsUuid.length() != 9) { return -1; @@ -267,6 +279,7 @@ public final class StorageVolume implements Parcelable { } /** {@hide} */ + @UnsupportedAppUsage public String getUserLabel() { return mDescription; } diff --git a/core/java/android/os/storage/VolumeInfo.java b/core/java/android/os/storage/VolumeInfo.java index 8c7750242ef3..afd383691300 100644 --- a/core/java/android/os/storage/VolumeInfo.java +++ b/core/java/android/os/storage/VolumeInfo.java @@ -18,6 +18,7 @@ package android.os.storage; import android.annotation.NonNull; import android.annotation.Nullable; +import android.annotation.UnsupportedAppUsage; import android.content.Context; import android.content.Intent; import android.content.res.Resources; @@ -76,8 +77,10 @@ public class VolumeInfo implements Parcelable { /** Real volume representing internal emulated storage */ public static final String ID_EMULATED_INTERNAL = "emulated"; + @UnsupportedAppUsage public static final int TYPE_PUBLIC = IVold.VOLUME_TYPE_PUBLIC; public static final int TYPE_PRIVATE = IVold.VOLUME_TYPE_PRIVATE; + @UnsupportedAppUsage public static final int TYPE_EMULATED = IVold.VOLUME_TYPE_EMULATED; public static final int TYPE_ASEC = IVold.VOLUME_TYPE_ASEC; public static final int TYPE_OBB = IVold.VOLUME_TYPE_OBB; @@ -148,16 +151,23 @@ public class VolumeInfo implements Parcelable { /** vold state */ public final String id; + @UnsupportedAppUsage public final int type; + @UnsupportedAppUsage public final DiskInfo disk; public final String partGuid; public int mountFlags = 0; public int mountUserId = -1; + @UnsupportedAppUsage public int state = STATE_UNMOUNTED; public String fsType; + @UnsupportedAppUsage public String fsUuid; + @UnsupportedAppUsage public String fsLabel; + @UnsupportedAppUsage public String path; + @UnsupportedAppUsage public String internalPath; public VolumeInfo(String id, int type, DiskInfo disk, String partGuid) { @@ -167,6 +177,7 @@ public class VolumeInfo implements Parcelable { this.partGuid = partGuid; } + @UnsupportedAppUsage public VolumeInfo(Parcel parcel) { id = parcel.readString(); type = parcel.readInt(); @@ -186,6 +197,7 @@ public class VolumeInfo implements Parcelable { internalPath = parcel.readString(); } + @UnsupportedAppUsage public static @NonNull String getEnvironmentForState(int state) { final String envState = sStateToEnvironment.get(state); if (envState != null) { @@ -207,22 +219,27 @@ public class VolumeInfo implements Parcelable { return sDescriptionComparator; } + @UnsupportedAppUsage public @NonNull String getId() { return id; } + @UnsupportedAppUsage public @Nullable DiskInfo getDisk() { return disk; } + @UnsupportedAppUsage public @Nullable String getDiskId() { return (disk != null) ? disk.id : null; } + @UnsupportedAppUsage public int getType() { return type; } + @UnsupportedAppUsage public int getState() { return state; } @@ -231,14 +248,17 @@ public class VolumeInfo implements Parcelable { return sStateToDescrip.get(state, 0); } + @UnsupportedAppUsage public @Nullable String getFsUuid() { return fsUuid; } + @UnsupportedAppUsage public int getMountUserId() { return mountUserId; } + @UnsupportedAppUsage public @Nullable String getDescription() { if (ID_PRIVATE_INTERNAL.equals(id) || ID_EMULATED_INTERNAL.equals(id)) { return Resources.getSystem().getString(com.android.internal.R.string.storage_internal); @@ -249,22 +269,27 @@ public class VolumeInfo implements Parcelable { } } + @UnsupportedAppUsage public boolean isMountedReadable() { return state == STATE_MOUNTED || state == STATE_MOUNTED_READ_ONLY; } + @UnsupportedAppUsage public boolean isMountedWritable() { return state == STATE_MOUNTED; } + @UnsupportedAppUsage public boolean isPrimary() { return (mountFlags & MOUNT_FLAG_PRIMARY) != 0; } + @UnsupportedAppUsage public boolean isPrimaryPhysical() { return isPrimary() && (getType() == TYPE_PUBLIC); } + @UnsupportedAppUsage public boolean isVisible() { return (mountFlags & MOUNT_FLAG_VISIBLE) != 0; } @@ -283,18 +308,22 @@ public class VolumeInfo implements Parcelable { return isVisibleForUser(userId); } + @UnsupportedAppUsage public boolean isVisibleForWrite(int userId) { return isVisibleForUser(userId); } + @UnsupportedAppUsage public File getPath() { return (path != null) ? new File(path) : null; } + @UnsupportedAppUsage public File getInternalPath() { return (internalPath != null) ? new File(internalPath) : null; } + @UnsupportedAppUsage public File getPathForUser(int userId) { if (path == null) { return null; @@ -311,6 +340,7 @@ public class VolumeInfo implements Parcelable { * Path which is accessible to apps holding * {@link android.Manifest.permission#WRITE_MEDIA_STORAGE}. */ + @UnsupportedAppUsage public File getInternalPathForUser(int userId) { if (path == null) { return null; @@ -322,6 +352,7 @@ public class VolumeInfo implements Parcelable { } } + @UnsupportedAppUsage public StorageVolume buildStorageVolume(Context context, int userId, boolean reportUnmounted) { final StorageManager storage = context.getSystemService(StorageManager.class); @@ -382,6 +413,7 @@ public class VolumeInfo implements Parcelable { derivedFsUuid, envState); } + @UnsupportedAppUsage public static int buildStableMtpStorageId(String fsUuid) { if (TextUtils.isEmpty(fsUuid)) { return StorageVolume.STORAGE_ID_INVALID; @@ -408,6 +440,7 @@ public class VolumeInfo implements Parcelable { * Build an intent to browse the contents of this volume. Only valid for * {@link #TYPE_EMULATED} or {@link #TYPE_PUBLIC}. */ + @UnsupportedAppUsage public @Nullable Intent buildBrowseIntent() { return buildBrowseIntentForUser(UserHandle.myUserId()); } @@ -486,6 +519,7 @@ public class VolumeInfo implements Parcelable { return id.hashCode(); } + @UnsupportedAppUsage public static final Creator<VolumeInfo> CREATOR = new Creator<VolumeInfo>() { @Override public VolumeInfo createFromParcel(Parcel in) { diff --git a/core/java/android/os/storage/VolumeRecord.java b/core/java/android/os/storage/VolumeRecord.java index 7b2022385f0e..bc2d55a92b90 100644 --- a/core/java/android/os/storage/VolumeRecord.java +++ b/core/java/android/os/storage/VolumeRecord.java @@ -16,6 +16,7 @@ package android.os.storage; +import android.annotation.UnsupportedAppUsage; import android.os.Parcel; import android.os.Parcelable; import android.util.DebugUtils; @@ -52,6 +53,7 @@ public class VolumeRecord implements Parcelable { this.fsUuid = Preconditions.checkNotNull(fsUuid); } + @UnsupportedAppUsage public VolumeRecord(Parcel parcel) { type = parcel.readInt(); fsUuid = parcel.readString(); @@ -127,6 +129,7 @@ public class VolumeRecord implements Parcelable { return fsUuid.hashCode(); } + @UnsupportedAppUsage public static final Creator<VolumeRecord> CREATOR = new Creator<VolumeRecord>() { @Override public VolumeRecord createFromParcel(Parcel in) { diff --git a/core/java/android/transition/ChangeBounds.java b/core/java/android/transition/ChangeBounds.java index 56af3ac0f3c9..c8228326b8e4 100644 --- a/core/java/android/transition/ChangeBounds.java +++ b/core/java/android/transition/ChangeBounds.java @@ -22,6 +22,7 @@ import android.animation.AnimatorSet; import android.animation.ObjectAnimator; import android.animation.PropertyValuesHolder; import android.animation.RectEvaluator; +import android.annotation.UnsupportedAppUsage; import android.content.Context; import android.content.res.TypedArray; import android.graphics.Bitmap; @@ -108,6 +109,7 @@ public class ChangeBounds extends Transition { } }; + @UnsupportedAppUsage private static final Property<View, PointF> BOTTOM_RIGHT_ONLY_PROPERTY = new Property<View, PointF>(PointF.class, "bottomRight") { @Override @@ -142,6 +144,7 @@ public class ChangeBounds extends Transition { } }; + @UnsupportedAppUsage private static final Property<View, PointF> POSITION_PROPERTY = new Property<View, PointF>(PointF.class, "position") { @Override diff --git a/core/java/android/transition/Scene.java b/core/java/android/transition/Scene.java index 2c858cde17a4..1bdcff98ff17 100644 --- a/core/java/android/transition/Scene.java +++ b/core/java/android/transition/Scene.java @@ -16,6 +16,7 @@ package android.transition; +import android.annotation.UnsupportedAppUsage; import android.content.Context; import android.util.SparseArray; import android.view.LayoutInflater; @@ -35,7 +36,9 @@ public final class Scene { private int mLayoutId = -1; private ViewGroup mSceneRoot; private View mLayout; // alternative to layoutId + @UnsupportedAppUsage Runnable mEnterAction; + @UnsupportedAppUsage Runnable mExitAction; /** @@ -195,6 +198,7 @@ public final class Scene { * * @param view The view on which the current scene is being set */ + @UnsupportedAppUsage static void setCurrentScene(View view, Scene scene) { view.setTagInternal(com.android.internal.R.id.current_scene, scene); } diff --git a/core/java/android/transition/Transition.java b/core/java/android/transition/Transition.java index 255a02938c32..b79228d45a92 100644 --- a/core/java/android/transition/Transition.java +++ b/core/java/android/transition/Transition.java @@ -20,6 +20,7 @@ import android.animation.Animator; import android.animation.AnimatorListenerAdapter; import android.animation.TimeInterpolator; import android.annotation.Nullable; +import android.annotation.UnsupportedAppUsage; import android.content.Context; import android.content.res.TypedArray; import android.graphics.Path; @@ -848,6 +849,7 @@ public abstract class Transition implements Cloneable { return false; } + @UnsupportedAppUsage private static ArrayMap<Animator, AnimationInfo> getRunningAnimators() { ArrayMap<Animator, AnimationInfo> runningAnimators = sRunningAnimators.get(); if (runningAnimators == null) { @@ -1915,6 +1917,7 @@ public abstract class Transition implements Cloneable { * * @hide */ + @UnsupportedAppUsage protected void end() { --mNumInstances; if (mNumInstances == 0) { @@ -1967,6 +1970,7 @@ public abstract class Transition implements Cloneable { * * @hide */ + @UnsupportedAppUsage protected void cancel() { int numAnimators = mCurrentAnimators.size(); for (int i = numAnimators - 1; i >= 0; i--) { diff --git a/core/java/android/transition/TransitionManager.java b/core/java/android/transition/TransitionManager.java index 45134c055ca4..f8e8762ef592 100644 --- a/core/java/android/transition/TransitionManager.java +++ b/core/java/android/transition/TransitionManager.java @@ -17,6 +17,7 @@ package android.transition; import android.annotation.TestApi; +import android.annotation.UnsupportedAppUsage; import android.content.Context; import android.util.ArrayMap; import android.util.Log; @@ -73,9 +74,11 @@ public class TransitionManager { ArrayMap<Scene, Transition> mSceneTransitions = new ArrayMap<Scene, Transition>(); ArrayMap<Scene, ArrayMap<Scene, Transition>> mScenePairTransitions = new ArrayMap<Scene, ArrayMap<Scene, Transition>>(); + @UnsupportedAppUsage private static ThreadLocal<WeakReference<ArrayMap<ViewGroup, ArrayList<Transition>>>> sRunningTransitions = new ThreadLocal<WeakReference<ArrayMap<ViewGroup, ArrayList<Transition>>>>(); + @UnsupportedAppUsage private static ArrayList<ViewGroup> sPendingTransitions = new ArrayList<ViewGroup>(); @@ -207,6 +210,7 @@ public class TransitionManager { } } + @UnsupportedAppUsage private static ArrayMap<ViewGroup, ArrayList<Transition>> getRunningTransitions() { WeakReference<ArrayMap<ViewGroup, ArrayList<Transition>>> runningTransitions = sRunningTransitions.get(); |