gadget: Fix mismerge of LA.VENDOR.1.0.r1-23800-WAIPIO.QSSI14.0
Change-Id: I71203dd21fe1333db9fbeb18eab3cd3290544b40
diff --git a/hal/UsbGadget.cpp b/hal/UsbGadget.cpp
index d2c2e67..d311bd0 100644
--- a/hal/UsbGadget.cpp
+++ b/hal/UsbGadget.cpp
@@ -101,30 +101,6 @@
}
}
-static std::map<std::string, std::tuple<std::string, std::string, std::string> >
-supported_compositions;
-
-static void createCompositionsMap(std:: string fileName) {
- std::ifstream compositions(fileName);
- std::string line;
-
- while (std::getline(compositions, line)) {
- std::string prop;
- std::tuple<std::string, std::string, std::string> vpa;
- // Ignore comments in the file
- auto pos = line.find('#');
- if (pos != std::string::npos)
- line.erase(pos);
-
- std::stringstream words(line);
-
- words >> prop >> std::get<0>(vpa) >> std::get<1>(vpa) >> std::get<2>(vpa);
- // If we get vpa[1], we have the three minimum values needed. Or else we skip
- if (!std::get<1>(vpa).empty())
- supported_compositions.insert_or_assign(prop, vpa);
- }
-}
-
UsbGadget::UsbGadget(const char* const gadget)
: mCurrentUsbFunctionsApplied(false),
mMonitorFfs(gadget) {