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

Remove an abused global so we can actually see logging.

Browse source 
Change-Id: Ib97440bc0542003b84c45cb05f194ba20104dad6
This commit is contained in:
Elliott Hughes 2016-06-15 15:14:04 -07:00
parent 59f04b9982
commit 59bf0da22f
1 changed files with 11 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
adb_install.cpp
View file

@ -33,10 +33,7 @@
#include "minadbd/fuse_adb_provider.h"
#include "fuse_sideload.h"
static RecoveryUI* ui = NULL;
static void
set_usb_driver(bool enabled) {
static void set_usb_driver(RecoveryUI* ui, bool enabled) {
int fd = open("/sys/class/android_usb/android0/enable", O_WRONLY);
if (fd < 0) {
ui->Print("failed to open driver control: %s\n", strerror(errno));
@ -50,18 +47,16 @@ set_usb_driver(bool enabled) {
}
}
static void
stop_adbd() {
static void stop_adbd(RecoveryUI* ui) {
ui->Print("Stopping adbd...\n");
property_set("ctl.stop", "adbd");
set_usb_driver(false);
set_usb_driver(ui, false);
}
static void
maybe_restart_adbd() {
static void maybe_restart_adbd(RecoveryUI* ui) {
if (is_ro_debuggable()) {
ui->Print("Restarting adbd...\n");
set_usb_driver(true);
set_usb_driver(ui, true);
property_set("ctl.start", "adbd");
}
}
@ -70,14 +65,11 @@ maybe_restart_adbd() {
// package, before timing out.
#define ADB_INSTALL_TIMEOUT 300
int
apply_from_adb(RecoveryUI* ui_, bool* wipe_cache, const char* install_file) {
int apply_from_adb(RecoveryUI* ui, bool* wipe_cache, const char* install_file) {
modified_flash = true;
ui = ui_;
stop_adbd();
set_usb_driver(true);
stop_adbd(ui);
set_usb_driver(ui, true);
ui->Print("\n\nNow send the package you want to apply\n"
"to the device with \"adb sideload <filename>\"...\n");
@ -137,8 +129,8 @@ apply_from_adb(RecoveryUI* ui_, bool* wipe_cache, const char* install_file) {
}
}
set_usb_driver(false);
maybe_restart_adbd();
set_usb_driver(ui, false);
maybe_restart_adbd(ui);
return result;
}