summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2016-06-16 01:32:14 +0200
committerandroid-build-merger <android-build-merger@google.com>2016-06-16 01:32:14 +0200
commit5aff6c772b76be448986d8fc96250c81f6a1698f (patch)
tree356f821cbf4edf97c49f757fc01222b3b5d91233
parentMerge \\\\"init now uses libprocessgroup, so set up /acct.\\\\" am: 279876c932 am: c58d7dda8c am: a087302da7 (diff)
parentMerge \\\"Remove an abused global so we can actually see logging.\\\" am: 37450d7f42 am: 4692e5d8c8 (diff)
downloadandroid_bootable_recovery-5aff6c772b76be448986d8fc96250c81f6a1698f.tar
android_bootable_recovery-5aff6c772b76be448986d8fc96250c81f6a1698f.tar.gz
android_bootable_recovery-5aff6c772b76be448986d8fc96250c81f6a1698f.tar.bz2
android_bootable_recovery-5aff6c772b76be448986d8fc96250c81f6a1698f.tar.lz
android_bootable_recovery-5aff6c772b76be448986d8fc96250c81f6a1698f.tar.xz
android_bootable_recovery-5aff6c772b76be448986d8fc96250c81f6a1698f.tar.zst
android_bootable_recovery-5aff6c772b76be448986d8fc96250c81f6a1698f.zip
-rw-r--r--adb_install.cpp30
1 files changed, 11 insertions, 19 deletions
diff --git a/adb_install.cpp b/adb_install.cpp
index 4aed9d4b1..b05fda13a 100644
--- a/adb_install.cpp
+++ b/adb_install.cpp
@@ -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;
}