diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-02-14 18:20:13 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-02-14 18:20:13 +0000 |
| commit | 4391c43f975e147a4c0548427691b2ca71eb508c (patch) | |
| tree | da1533444665754b7a1d621ad4a36b9ce6f96064 | |
| parent | 0cd9beb290a8724b72a33dd52e30c47588167375 (diff) | |
| parent | b17381ae8446a54b2ebdf542c0cd73f61d26b0c3 (diff) | |
| download | gs201-android13-qpr2-s8-release.tar.gz | |
Merge cherrypicks of ['googleplex-android-review.googlesource.com/20729654'] into tm-qpr2-release.android-13.0.0_r45android-13.0.0_r44android-13.0.0_r43android-13.0.0_r42android-13.0.0_r41android-13.0.0_r40android-13.0.0_r39android-13.0.0_r38android13-qpr2-s9-releaseandroid13-qpr2-s8-releaseandroid13-qpr2-s7-releaseandroid13-qpr2-s12-releaseandroid13-qpr2-s11-releaseandroid13-qpr2-s10-releaseandroid13-qpr2-release
Change-Id: I8ea402bab9c0a24212992294e9f1354b58582a0f
| -rw-r--r-- | usb/gadget/UsbGadget.h | 4 | ||||
| -rw-r--r-- | usb/gadget/android.hardware.usb.gadget-service.rc | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/usb/gadget/UsbGadget.h b/usb/gadget/UsbGadget.h index 61e6e79..f036c8e 100644 --- a/usb/gadget/UsbGadget.h +++ b/usb/gadget/UsbGadget.h @@ -79,7 +79,9 @@ constexpr char kSmpAffinityList[] = "/smp_affinity_list"; #ifndef UDC_PATH #define UDC_PATH "/sys/class/udc/11210000.dwc3/" #endif -static MonitorFfs monitorFfs(kGadgetName); +constexpr char kExtconTypecState[] = "/sys/class/extcon/extcon0/cable.0/state"; +constexpr char kUsbGadgetState[] = "/sys/devices/platform/11210000.usb/dwc3_exynos_gadget_state"; +static MonitorFfs monitorFfs(kGadgetName, kExtconTypecState, kUsbGadgetState); #define SPEED_PATH UDC_PATH "current_speed" diff --git a/usb/gadget/android.hardware.usb.gadget-service.rc b/usb/gadget/android.hardware.usb.gadget-service.rc index e3c3b0d..0395862 100644 --- a/usb/gadget/android.hardware.usb.gadget-service.rc +++ b/usb/gadget/android.hardware.usb.gadget-service.rc @@ -10,6 +10,7 @@ on post-fs chown root system /sys/devices/platform/10d60000.hsi2c/i2c-2/i2c-max77759tcpc/contaminant_detection chown root system /sys/devices/platform/11210000.usb/dwc3_exynos_otg_b_sess chown root system /sys/devices/platform/11210000.usb/dwc3_exynos_otg_id + chown root system /sys/devices/platform/11210000.usb/dwc3_exynos_gadget_state chown root system /sys/devices/platform/11210000.usb/usb_data_enabled chmod 664 /sys/class/typec/port0/power_role chmod 664 /sys/class/typec/port0/data_role |