tequilaOS/platform_bootable_recovery
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

recovery: Remove SetUsbConfig() out of common.h.

Browse source 
libinstall now has its own copy.

Test: mmma -j bootable/recovery
Change-Id: Ibbe7084e15baeb7e744f2175d5944477092acc9e
This commit is contained in:
Tao Bao 2019-03-29 15:53:23 -07:00
parent bc982a4f88
commit e0cfab3de9
3 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common.h
View file

@ -36,5 +36,3 @@ extern std::string stage;
extern const char* reason;
bool is_ro_debuggable();
bool SetUsbConfig(const std::string& state);

6
recovery.cpp
View file

@ -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" };

6
recovery_main.cpp
View file

@ -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) {