diff options
| author | Josh Gao <jmgao@google.com> | 2021-08-17 00:57:04 -0700 |
|---|---|---|
| committer | Jack Pham <quic_jackp@quicinc.com> | 2021-12-23 14:36:15 -0800 |
| commit | 2d91b225eccb284e7fd353bbc10a37f652966aec (patch) | |
| tree | 60a362324d886591609251a598cee771fbf7fc94 /usb | |
| parent | 4959dded7135477395e8a5937738e540ba5bea03 (diff) | |
Enable MS OS descriptors for adb.
This change ported from
https://android-review.googlesource.com/c/platform/hardware/google/pixel/+/1116495
Bug: 68993980
Test: check_ms_os_desc
Change-Id: Ifb758f796e58ee648987a71c3aa6f2b4b8004273
Diffstat (limited to 'usb')
| -rw-r--r-- | usb/gadget/1.1/default/lib/UsbGadgetUtils.cpp | 3 | ||||
| -rw-r--r-- | usb/gadget/1.2/default/lib/UsbGadgetUtils.cpp | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/usb/gadget/1.1/default/lib/UsbGadgetUtils.cpp b/usb/gadget/1.1/default/lib/UsbGadgetUtils.cpp index 8402853b99..4c40bf88af 100644 --- a/usb/gadget/1.1/default/lib/UsbGadgetUtils.cpp +++ b/usb/gadget/1.1/default/lib/UsbGadgetUtils.cpp @@ -178,6 +178,9 @@ Status addGenericAndroidFunctions(MonitorFfs* monitorFfs, uint64_t functions, bo Status addAdb(MonitorFfs* monitorFfs, int* functionCount) { ALOGI("setCurrentUsbFunctions Adb"); + if (!WriteStringToFile("1", DESC_USE_PATH)) + return Status::ERROR; + if (!monitorFfs->addInotifyFd("/dev/usb-ffs/adb/")) return Status::ERROR; if (linkFunction("ffs.adb", (*functionCount)++)) return Status::ERROR; diff --git a/usb/gadget/1.2/default/lib/UsbGadgetUtils.cpp b/usb/gadget/1.2/default/lib/UsbGadgetUtils.cpp index 898655651c..fa50821b5b 100644 --- a/usb/gadget/1.2/default/lib/UsbGadgetUtils.cpp +++ b/usb/gadget/1.2/default/lib/UsbGadgetUtils.cpp @@ -190,6 +190,9 @@ Status addGenericAndroidFunctions(MonitorFfs* monitorFfs, uint64_t functions, bo Status addAdb(MonitorFfs* monitorFfs, int* functionCount) { ALOGI("setCurrentUsbFunctions Adb"); + if (!WriteStringToFile("1", DESC_USE_PATH)) + return Status::ERROR; + if (!monitorFfs->addInotifyFd("/dev/usb-ffs/adb/")) return Status::ERROR; if (linkFunction("ffs.adb", (*functionCount)++)) return Status::ERROR; |