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

Merge "USB: [Tethering mainline] Expose @hide APIs to @SystemApi"

Browse Source
This commit is contained in:
Treehugger Robot
2020-01-09 04:26:36 +00:00
committed by Gerrit Code Review
parent db9335b832 7d66bd9b54
commit d997a3571b
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
api/system-current.txt
View File

@@ -3241,9 +3241,17 @@ package android.hardware.usb {
}
public class UsbManager {
method @RequiresPermission(android.Manifest.permission.MANAGE_USB) public long getCurrentFunctions();
method @NonNull @RequiresPermission(android.Manifest.permission.MANAGE_USB) public java.util.List<android.hardware.usb.UsbPort> getPorts();
method @RequiresPermission(android.Manifest.permission.MANAGE_USB) public void grantPermission(android.hardware.usb.UsbDevice, String);
method @RequiresPermission(android.Manifest.permission.MANAGE_USB) public void setCurrentFunctions(long);
field @RequiresPermission(android.Manifest.permission.MANAGE_USB) public static final String ACTION_USB_PORT_CHANGED = "android.hardware.usb.action.USB_PORT_CHANGED";
field public static final String ACTION_USB_STATE = "android.hardware.usb.action.USB_STATE";
field public static final long FUNCTION_NONE = 0L; // 0x0L
field public static final long FUNCTION_RNDIS = 32L; // 0x20L
field public static final String USB_CONFIGURED = "configured";
field public static final String USB_CONNECTED = "connected";
field public static final String USB_FUNCTION_RNDIS = "rndis";
}
public final class UsbPort {

12
core/java/android/hardware/usb/UsbManager.java
View File

@@ -91,7 +91,7 @@ public class UsbManager {
*
* {@hide}
*/
@UnsupportedAppUsage
@SystemApi
public static final String ACTION_USB_STATE =
"android.hardware.usb.action.USB_STATE";
@@ -164,7 +164,7 @@ public class UsbManager {
*
* {@hide}
*/
@UnsupportedAppUsage
@SystemApi
public static final String USB_CONNECTED = "connected";
/**
@@ -181,6 +181,7 @@ public class UsbManager {
*
* {@hide}
*/
@SystemApi
public static final String USB_CONFIGURED = "configured";
/**
@@ -217,6 +218,7 @@ public class UsbManager {
*
* {@hide}
*/
@SystemApi
public static final String USB_FUNCTION_RNDIS = "rndis";
/**
@@ -319,6 +321,7 @@ public class UsbManager {
* Code for the charging usb function. Passed into {@link #setCurrentFunctions(long)}
* {@hide}
*/
@SystemApi
public static final long FUNCTION_NONE = 0;
/**
@@ -337,6 +340,7 @@ public class UsbManager {
* Code for the rndis usb function. Passed as a mask into {@link #setCurrentFunctions(long)}
* {@hide}
*/
@SystemApi
public static final long FUNCTION_RNDIS = GadgetFunction.RNDIS;
/**
@@ -698,6 +702,8 @@ public class UsbManager {
*
* {@hide}
*/
@SystemApi
@RequiresPermission(Manifest.permission.MANAGE_USB)
public void setCurrentFunctions(long functions) {
try {
mService.setCurrentFunctions(functions);
@@ -737,6 +743,8 @@ public class UsbManager {
*
* {@hide}
*/
@SystemApi
@RequiresPermission(Manifest.permission.MANAGE_USB)
public long getCurrentFunctions() {
try {
return mService.getCurrentFunctions();