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

Merge changes I824c99fa,I1ce03549 am: 3e77c6f37e am: 0ed7123787 am: 8f515cf862

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2626140

Change-Id: Ib1a5a1777bc8bd97b9bcd230b9a89c470d51165e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-06-21 06:07:50 +00:00
committed by Automerger Merge Worker
parent 1f4e37eaf4 8f515cf862
commit ee9d553b7d
4 changed files with 3 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/usb/java/com/android/server/usb/hal/gadget/UsbGadgetAidl.java
View File

@@ -67,10 +67,6 @@ public final class UsbGadgetAidl implements UsbGadgetHal {
return GADGET_HAL_V2_0;
}
@Override
public void systemReady() {
}
public void serviceDied() {
logAndPrint(Log.ERROR, mPw, "Usb Gadget AIDL hal service died");
synchronized (mGadgetProxyLock) {

63
services/usb/java/com/android/server/usb/hal/gadget/UsbGadgetHal.java
View File

@@ -28,69 +28,6 @@ import java.lang.String;
* @hide
*/
public interface UsbGadgetHal {
/**
* Power role: This USB port can act as a source (provide power).
* @hide
*/
public static final int HAL_POWER_ROLE_SOURCE = 1;
/**
* Power role: This USB port can act as a sink (receive power).
* @hide
*/
public static final int HAL_POWER_ROLE_SINK = 2;
@IntDef(prefix = { "HAL_POWER_ROLE_" }, value = {
HAL_POWER_ROLE_SOURCE,
HAL_POWER_ROLE_SINK
})
@Retention(RetentionPolicy.SOURCE)
@interface HalUsbPowerRole{}
/**
* Data role: This USB port can act as a host (access data services).
* @hide
*/
public static final int HAL_DATA_ROLE_HOST = 1;
/**
* Data role: This USB port can act as a device (offer data services).
* @hide
*/
public static final int HAL_DATA_ROLE_DEVICE = 2;
@IntDef(prefix = { "HAL_DATA_ROLE_" }, value = {
HAL_DATA_ROLE_HOST,
HAL_DATA_ROLE_DEVICE
})
@Retention(RetentionPolicy.SOURCE)
@interface HalUsbDataRole{}
/**
* This USB port can act as a downstream facing port (host).
*
* @hide
*/
public static final int HAL_MODE_DFP = 1;
/**
* This USB port can act as an upstream facing port (device).
*
* @hide
*/
public static final int HAL_MODE_UFP = 2;
@IntDef(prefix = { "HAL_MODE_" }, value = {
HAL_MODE_DFP,
HAL_MODE_UFP,
})
@Retention(RetentionPolicy.SOURCE)
@interface HalUsbPortMode{}
/**
* UsbPortManager would call this when the system is done booting.
*/
public void systemReady();
/**
* This function is used to query the USB functions included in the
* current USB configuration.

4
services/usb/java/com/android/server/usb/hal/gadget/UsbGadgetHidl.java
View File

@@ -123,10 +123,6 @@ public final class UsbGadgetHidl implements UsbGadgetHal {
}
}
@Override
public void systemReady() {
}
static boolean isServicePresent(IndentingPrintWriter pw) {
try {
IUsbGadget.getService(true);

6
services/usb/java/com/android/server/usb/hal/port/UsbPortHal.java
View File

@@ -70,17 +70,17 @@ public interface UsbPortHal {
*
* @hide
*/
public static final int HAL_MODE_DFP = 1;
public static final int HAL_MODE_UFP = 1;
/**
* This USB port can act as an upstream facing port (device).
*
* @hide
*/
public static final int HAL_MODE_UFP = 2;
public static final int HAL_MODE_DFP = 2;
@IntDef(prefix = { "HAL_MODE_" }, value = {
HAL_MODE_DFP,
HAL_MODE_UFP,
HAL_MODE_DFP,
})
@Retention(RetentionPolicy.SOURCE)
@interface HalUsbPortMode{}