Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add @UnsupportedAppUsage annotations" am: 3610ca221d am: 72667caaa6

Browse Source 
am: f82c47fc72

Change-Id: Id649fb3818dcf22186338b801d9e02ea49f69fbb
This commit is contained in:
Mathew Inwood
2018-08-10 08:40:08 -07:00
committed by android-build-merger
parent dcb1d7fe4f f82c47fc72
commit d899ddb581
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/hiddenapi-light-greylist.txt
View File

@@ -2403,10 +2403,6 @@ Landroid/media/VolumeShaper$State;-><init>(FF)V
Landroid/media/VolumeShaper$State;->mVolume:F Landroid/media/VolumeShaper$State;->mVolume:F
Landroid/media/VolumeShaper$State;->mXOffset:F Landroid/media/VolumeShaper$State;->mXOffset:F
Landroid/media/WebVttRenderer;-><init>(Landroid/content/Context;)V 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;->ACTION_TETHER_STATE_CHANGED:Ljava/lang/String;
Landroid/net/ConnectivityManager;->EXTRA_ACTIVE_TETHER:Ljava/lang/String; Landroid/net/ConnectivityManager;->EXTRA_ACTIVE_TETHER:Ljava/lang/String;
Landroid/net/ConnectivityManager;->EXTRA_AVAILABLE_TETHER:Ljava/lang/String; Landroid/net/ConnectivityManager;->EXTRA_AVAILABLE_TETHER:Ljava/lang/String;

3
media/java/android/mtp/MtpPropertyList.java
View File

@@ -16,6 +16,7 @@
package android.mtp; package android.mtp;
import android.annotation.UnsupportedAppUsage;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@@ -49,6 +50,7 @@ class MtpPropertyList {
mStringValues = new ArrayList<>(); mStringValues = new ArrayList<>();
} }
@UnsupportedAppUsage
public void append(int handle, int property, int type, long value) { public void append(int handle, int property, int type, long value) {
mObjectHandles.add(handle); mObjectHandles.add(handle);
mPropertyCodes.add(property); mPropertyCodes.add(property);
@@ -57,6 +59,7 @@ class MtpPropertyList {
mStringValues.add(null); mStringValues.add(null);
} }
@UnsupportedAppUsage
public void append(int handle, int property, String value) { public void append(int handle, int property, String value) {
mObjectHandles.add(handle); mObjectHandles.add(handle);
mPropertyCodes.add(property); mPropertyCodes.add(property);

3
media/java/android/mtp/MtpStorage.java
View File

@@ -16,6 +16,7 @@
package android.mtp; package android.mtp;
import android.annotation.UnsupportedAppUsage;
import android.os.storage.StorageVolume; import android.os.storage.StorageVolume;
/** /**
@@ -46,6 +47,7 @@ public class MtpStorage {
* *
* @return the storage ID * @return the storage ID
*/ */
@UnsupportedAppUsage
public final int getStorageId() { public final int getStorageId() {
return mStorageId; return mStorageId;
} }
@@ -55,6 +57,7 @@ public class MtpStorage {
* *
* @return the storage file path * @return the storage file path
*/ */
@UnsupportedAppUsage
public final String getPath() { public final String getPath() {
return mPath; return mPath;
} }