recovery: Remove SetUsbConfig() out of common.h.
libinstall now has its own copy.
Test: mmma -j bootable/recovery
Change-Id: Ibbe7084e15baeb7e744f2175d5944477092acc9e
diff --git a/common.h b/common.h
index 9cb44bd..a524a41 100644
--- a/common.h
+++ b/common.h
@@ -36,5 +36,3 @@
extern const char* reason;
bool is_ro_debuggable();
-
-bool SetUsbConfig(const std::string& state);
diff --git a/recovery.cpp b/recovery.cpp
index 02cc53c..0349184 100644
--- a/recovery.cpp
+++ b/recovery.cpp
@@ -271,12 +271,6 @@
return (result == 0);
}
-// Sets the usb config to 'state'
-bool SetUsbConfig(const std::string& state) {
- android::base::SetProperty("sys.usb.config", state);
- return android::base::WaitForProperty("sys.usb.state", state);
-}
-
static bool yes_no(Device* device, const char* question1, const char* question2) {
std::vector<std::string> headers{ question1, question2 };
std::vector<std::string> items{ " No", " Yes" };
diff --git a/recovery_main.cpp b/recovery_main.cpp
index 56ebe16..b41368d 100644
--- a/recovery_main.cpp
+++ b/recovery_main.cpp
@@ -178,6 +178,12 @@
return android::base::Trim(content);
}
+// Sets the usb config to 'state'.
+static bool SetUsbConfig(const std::string& state) {
+ android::base::SetProperty("sys.usb.config", state);
+ return android::base::WaitForProperty("sys.usb.state", state);
+}
+
static void ListenRecoverySocket(RecoveryUI* ui, std::atomic<Device::BuiltinAction>& action) {
android::base::unique_fd sock_fd(android_get_control_socket("recovery"));
if (sock_fd < 0) {