From e0cfab3de9d0e1b09799c7e488f171b31ddfe7bf Mon Sep 17 00:00:00 2001
From: Tao Bao <tbao@google.com>
Date: Fri, 29 Mar 2019 15:53:23 -0700
Subject: recovery: Remove SetUsbConfig() out of common.h.

libinstall now has its own copy.

Test: mmma -j bootable/recovery
Change-Id: Ibbe7084e15baeb7e744f2175d5944477092acc9e
---
 common.h          | 2 --
 recovery.cpp      | 6 ------
 recovery_main.cpp | 6 ++++++
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/common.h b/common.h
index 9cb44bd37..a524a4184 100644
--- a/common.h
+++ b/common.h
@@ -36,5 +36,3 @@ extern std::string stage;
 extern const char* reason;
 
 bool is_ro_debuggable();
-
-bool SetUsbConfig(const std::string& state);
diff --git a/recovery.cpp b/recovery.cpp
index 02cc53c2c..034918498 100644
--- a/recovery.cpp
+++ b/recovery.cpp
@@ -271,12 +271,6 @@ static bool erase_volume(const char* volume) {
   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 56ebe16fa..b41368d7b 100644
--- a/recovery_main.cpp
+++ b/recovery_main.cpp
@@ -178,6 +178,12 @@ static std::string load_locale_from_cache() {
   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) {
-- 
cgit v1.2.3