diff options
| author | 2018-08-10 08:40:08 -0700 | |
|---|---|---|
| committer | 2018-08-10 08:40:08 -0700 | |
| commit | d899ddb58197f95a6556cddbf4eeda4ba3eeb3bd (patch) | |
| tree | de94134157453e8fc8413f2e62f9d874bf26e299 | |
| parent | dcb1d7fe4f181269791a6105ef5d9ddd50ce038f (diff) | |
| parent | f82c47fc72ace2f75b2c6685fb3e35e88754eaba (diff) | |
Merge "Add @UnsupportedAppUsage annotations" am: 3610ca221d am: 72667caaa6
am: f82c47fc72
Change-Id: Id649fb3818dcf22186338b801d9e02ea49f69fbb
| -rw-r--r-- | config/hiddenapi-light-greylist.txt | 4 | ||||
| -rw-r--r-- | media/java/android/mtp/MtpPropertyList.java | 3 | ||||
| -rw-r--r-- | media/java/android/mtp/MtpStorage.java | 3 |
3 files changed, 6 insertions, 4 deletions
diff --git a/config/hiddenapi-light-greylist.txt b/config/hiddenapi-light-greylist.txt index cef272e03ab1..04d412c5e5df 100644 --- a/config/hiddenapi-light-greylist.txt +++ b/config/hiddenapi-light-greylist.txt @@ -2403,10 +2403,6 @@ Landroid/media/VolumeShaper$State;-><init>(FF)V Landroid/media/VolumeShaper$State;->mVolume:F Landroid/media/VolumeShaper$State;->mXOffset:F Landroid/media/WebVttRenderer;-><init>(Landroid/content/Context;)V -Landroid/mtp/MtpPropertyList;->append(IIIJ)V -Landroid/mtp/MtpPropertyList;->append(IILjava/lang/String;)V -Landroid/mtp/MtpStorage;->getPath()Ljava/lang/String; -Landroid/mtp/MtpStorage;->getStorageId()I Landroid/net/ConnectivityManager;->ACTION_TETHER_STATE_CHANGED:Ljava/lang/String; Landroid/net/ConnectivityManager;->EXTRA_ACTIVE_TETHER:Ljava/lang/String; Landroid/net/ConnectivityManager;->EXTRA_AVAILABLE_TETHER:Ljava/lang/String; diff --git a/media/java/android/mtp/MtpPropertyList.java b/media/java/android/mtp/MtpPropertyList.java index ede90dac517c..557f099c25c1 100644 --- a/media/java/android/mtp/MtpPropertyList.java +++ b/media/java/android/mtp/MtpPropertyList.java @@ -16,6 +16,7 @@ package android.mtp; +import android.annotation.UnsupportedAppUsage; import java.util.ArrayList; import java.util.List; @@ -49,6 +50,7 @@ class MtpPropertyList { mStringValues = new ArrayList<>(); } + @UnsupportedAppUsage public void append(int handle, int property, int type, long value) { mObjectHandles.add(handle); mPropertyCodes.add(property); @@ -57,6 +59,7 @@ class MtpPropertyList { mStringValues.add(null); } + @UnsupportedAppUsage public void append(int handle, int property, String value) { mObjectHandles.add(handle); mPropertyCodes.add(property); diff --git a/media/java/android/mtp/MtpStorage.java b/media/java/android/mtp/MtpStorage.java index 2625e0cc932c..c714b3cad296 100644 --- a/media/java/android/mtp/MtpStorage.java +++ b/media/java/android/mtp/MtpStorage.java @@ -16,6 +16,7 @@ package android.mtp; +import android.annotation.UnsupportedAppUsage; import android.os.storage.StorageVolume; /** @@ -46,6 +47,7 @@ public class MtpStorage { * * @return the storage ID */ + @UnsupportedAppUsage public final int getStorageId() { return mStorageId; } @@ -55,6 +57,7 @@ public class MtpStorage { * * @return the storage file path */ + @UnsupportedAppUsage public final String getPath() { return mPath; } |