commit 5354b8a14b17b0dade145a3a5f1de6f72275c36b
author Treehugger Robot <treehugger-gerrit@google.com> Mon Jan 10 23:45:28 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Jan 10 23:45:28 2022 +0000
tree 6d4973c48e1a2bdac70962bdc53783ac410785fc
parent 3d3884621a6446d84e1e58cf60bbdc3a032519c0
parent 482942111504cd482cade9acf08403208980f690

Merge "Enable MS OS descriptors for adb." am: cbb51b15fe am: e6cd994315 am: cda67e1a16 am: 4829421115

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1797476

Change-Id: I19ac52f354870471114dfbf2c3720da930297460

usb/gadget/1.1/default/lib/UsbGadgetUtils.cpp

diff --git a/usb/gadget/1.1/default/lib/UsbGadgetUtils.cpp b/usb/gadget/1.1/default/lib/UsbGadgetUtils.cpp
index 8402853..4c40bf8 100644
--- a/usb/gadget/1.1/default/lib/UsbGadgetUtils.cpp
+++ b/usb/gadget/1.1/default/lib/UsbGadgetUtils.cpp
@@ -178,6 +178,9 @@
 
 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;

usb/gadget/1.2/default/lib/UsbGadgetUtils.cpp

diff --git a/usb/gadget/1.2/default/lib/UsbGadgetUtils.cpp b/usb/gadget/1.2/default/lib/UsbGadgetUtils.cpp
index 8986556..fa50821 100644
--- a/usb/gadget/1.2/default/lib/UsbGadgetUtils.cpp
+++ b/usb/gadget/1.2/default/lib/UsbGadgetUtils.cpp
@@ -190,6 +190,9 @@
 
 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;