summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2017-05-01 20:31:28 +0200
committerTao Bao <tbao@google.com>2017-05-01 20:47:43 +0200
commit0150d013eb096a85e541294ee9df320ef4227df0 (patch)
tree09473679028a2f8a4f3bfff63da9bf05ed8eac88
parentMerge "minui: Fix breakage in graphics_adf." (diff)
downloadandroid_bootable_recovery-0150d013eb096a85e541294ee9df320ef4227df0.tar
android_bootable_recovery-0150d013eb096a85e541294ee9df320ef4227df0.tar.gz
android_bootable_recovery-0150d013eb096a85e541294ee9df320ef4227df0.tar.bz2
android_bootable_recovery-0150d013eb096a85e541294ee9df320ef4227df0.tar.lz
android_bootable_recovery-0150d013eb096a85e541294ee9df320ef4227df0.tar.xz
android_bootable_recovery-0150d013eb096a85e541294ee9df320ef4227df0.tar.zst
android_bootable_recovery-0150d013eb096a85e541294ee9df320ef4227df0.zip
-rw-r--r--adb_install.cpp189
-rw-r--r--adb_install.h4
-rw-r--r--recovery.cpp4
3 files changed, 96 insertions, 101 deletions
diff --git a/adb_install.cpp b/adb_install.cpp
index 79b8df91b..e7d7758f9 100644
--- a/adb_install.cpp
+++ b/adb_install.cpp
@@ -14,124 +14,121 @@
* limitations under the License.
*/
-#include <unistd.h>
-#include <dirent.h>
+#include "adb_install.h"
+
#include <errno.h>
+#include <fcntl.h>
+#include <signal.h>
#include <stdlib.h>
#include <string.h>
+#include <sys/stat.h>
#include <sys/types.h>
#include <sys/wait.h>
-#include <sys/stat.h>
-#include <signal.h>
-#include <fcntl.h>
+#include <unistd.h>
+
+#include <android-base/properties.h>
-#include "ui.h"
-#include "install.h"
#include "common.h"
-#include "adb_install.h"
-#include "minadbd/fuse_adb_provider.h"
#include "fuse_sideload.h"
+#include "install.h"
+#include "ui.h"
-#include <android-base/properties.h>
-
-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));
- return;
- }
- if (TEMP_FAILURE_RETRY(write(fd, enabled ? "1" : "0", 1)) == -1) {
- ui->Print("failed to set driver control: %s\n", strerror(errno));
- }
- if (close(fd) < 0) {
- ui->Print("failed to close driver control: %s\n", strerror(errno));
- }
+static void set_usb_driver(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));
+ return;
+ }
+ if (TEMP_FAILURE_RETRY(write(fd, enabled ? "1" : "0", 1)) == -1) {
+ ui->Print("failed to set driver control: %s\n", strerror(errno));
+ }
+ if (close(fd) < 0) {
+ ui->Print("failed to close driver control: %s\n", strerror(errno));
+ }
}
-static void stop_adbd(RecoveryUI* ui) {
- ui->Print("Stopping adbd...\n");
- android::base::SetProperty("ctl.stop", "adbd");
- set_usb_driver(ui, false);
+static void stop_adbd() {
+ ui->Print("Stopping adbd...\n");
+ android::base::SetProperty("ctl.stop", "adbd");
+ set_usb_driver(false);
}
-static void maybe_restart_adbd(RecoveryUI* ui) {
- if (is_ro_debuggable()) {
- ui->Print("Restarting adbd...\n");
- set_usb_driver(ui, true);
- android::base::SetProperty("ctl.start", "adbd");
- }
+static void maybe_restart_adbd() {
+ if (is_ro_debuggable()) {
+ ui->Print("Restarting adbd...\n");
+ set_usb_driver(true);
+ android::base::SetProperty("ctl.start", "adbd");
+ }
}
-// How long (in seconds) we wait for the host to start sending us a
-// package, before timing out.
-#define ADB_INSTALL_TIMEOUT 300
-
-int apply_from_adb(RecoveryUI* ui, bool* wipe_cache, const char* install_file) {
- modified_flash = 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");
-
- pid_t child;
- if ((child = fork()) == 0) {
- execl("/sbin/recovery", "recovery", "--adbd", NULL);
- _exit(EXIT_FAILURE);
+int apply_from_adb(bool* wipe_cache, const char* install_file) {
+ modified_flash = true;
+
+ stop_adbd();
+ set_usb_driver(true);
+
+ ui->Print(
+ "\n\nNow send the package you want to apply\n"
+ "to the device with \"adb sideload <filename>\"...\n");
+
+ pid_t child;
+ if ((child = fork()) == 0) {
+ execl("/sbin/recovery", "recovery", "--adbd", nullptr);
+ _exit(EXIT_FAILURE);
+ }
+
+ // How long (in seconds) we wait for the host to start sending us a package, before timing out.
+ static constexpr int ADB_INSTALL_TIMEOUT = 300;
+
+ // FUSE_SIDELOAD_HOST_PATHNAME will start to exist once the host connects and starts serving a
+ // package. Poll for its appearance. (Note that inotify doesn't work with FUSE.)
+ int result = INSTALL_ERROR;
+ int status;
+ bool waited = false;
+ for (int i = 0; i < ADB_INSTALL_TIMEOUT; ++i) {
+ if (waitpid(child, &status, WNOHANG) != 0) {
+ result = INSTALL_ERROR;
+ waited = true;
+ break;
}
- // FUSE_SIDELOAD_HOST_PATHNAME will start to exist once the host
- // connects and starts serving a package. Poll for its
- // appearance. (Note that inotify doesn't work with FUSE.)
- int result = INSTALL_ERROR;
- int status;
- bool waited = false;
struct stat st;
- for (int i = 0; i < ADB_INSTALL_TIMEOUT; ++i) {
- if (waitpid(child, &status, WNOHANG) != 0) {
- result = INSTALL_ERROR;
- waited = true;
- break;
- }
-
- if (stat(FUSE_SIDELOAD_HOST_PATHNAME, &st) != 0) {
- if (errno == ENOENT && i < ADB_INSTALL_TIMEOUT-1) {
- sleep(1);
- continue;
- } else {
- ui->Print("\nTimed out waiting for package.\n\n");
- result = INSTALL_ERROR;
- kill(child, SIGKILL);
- break;
- }
- }
- result = install_package(FUSE_SIDELOAD_HOST_PATHNAME, wipe_cache, install_file, false, 0);
+ if (stat(FUSE_SIDELOAD_HOST_PATHNAME, &st) != 0) {
+ if (errno == ENOENT && i < ADB_INSTALL_TIMEOUT - 1) {
+ sleep(1);
+ continue;
+ } else {
+ ui->Print("\nTimed out waiting for package.\n\n");
+ result = INSTALL_ERROR;
+ kill(child, SIGKILL);
break;
+ }
}
+ result = install_package(FUSE_SIDELOAD_HOST_PATHNAME, wipe_cache, install_file, false, 0);
+ break;
+ }
- if (!waited) {
- // Calling stat() on this magic filename signals the minadbd
- // subprocess to shut down.
- stat(FUSE_SIDELOAD_HOST_EXIT_PATHNAME, &st);
-
- // TODO(dougz): there should be a way to cancel waiting for a
- // package (by pushing some button combo on the device). For now
- // you just have to 'adb sideload' a file that's not a valid
- // package, like "/dev/null".
- waitpid(child, &status, 0);
- }
-
- if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) {
- if (WEXITSTATUS(status) == 3) {
- ui->Print("\nYou need adb 1.0.32 or newer to sideload\nto this device.\n\n");
- } else if (!WIFSIGNALED(status)) {
- ui->Print("\n(adbd status %d)\n", WEXITSTATUS(status));
- }
+ if (!waited) {
+ // Calling stat() on this magic filename signals the minadbd subprocess to shut down.
+ struct stat st;
+ stat(FUSE_SIDELOAD_HOST_EXIT_PATHNAME, &st);
+
+ // TODO: there should be a way to cancel waiting for a package (by pushing some button combo on
+ // the device). For now you just have to 'adb sideload' a file that's not a valid package, like
+ // "/dev/null".
+ waitpid(child, &status, 0);
+ }
+
+ if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) {
+ if (WEXITSTATUS(status) == 3) {
+ ui->Print("\nYou need adb 1.0.32 or newer to sideload\nto this device.\n\n");
+ } else if (!WIFSIGNALED(status)) {
+ ui->Print("\n(adbd status %d)\n", WEXITSTATUS(status));
}
+ }
- set_usb_driver(ui, false);
- maybe_restart_adbd(ui);
+ set_usb_driver(false);
+ maybe_restart_adbd();
- return result;
+ return result;
}
diff --git a/adb_install.h b/adb_install.h
index efad436fa..e654c893d 100644
--- a/adb_install.h
+++ b/adb_install.h
@@ -17,8 +17,6 @@
#ifndef _ADB_INSTALL_H
#define _ADB_INSTALL_H
-class RecoveryUI;
-
-int apply_from_adb(RecoveryUI* h, bool* wipe_cache, const char* install_file);
+int apply_from_adb(bool* wipe_cache, const char* install_file);
#endif
diff --git a/recovery.cpp b/recovery.cpp
index 3041d6cac..944c24086 100644
--- a/recovery.cpp
+++ b/recovery.cpp
@@ -1155,7 +1155,7 @@ static Device::BuiltinAction prompt_and_wait(Device* device, int status) {
{
bool adb = (chosen_action == Device::APPLY_ADB_SIDELOAD);
if (adb) {
- status = apply_from_adb(ui, &should_wipe_cache, TEMPORARY_INSTALL_FILE);
+ status = apply_from_adb(&should_wipe_cache, TEMPORARY_INSTALL_FILE);
} else {
status = apply_from_sdcard(device, &should_wipe_cache);
}
@@ -1584,7 +1584,7 @@ int main(int argc, char **argv) {
if (!sideload_auto_reboot) {
ui->ShowText(true);
}
- status = apply_from_adb(ui, &should_wipe_cache, TEMPORARY_INSTALL_FILE);
+ status = apply_from_adb(&should_wipe_cache, TEMPORARY_INSTALL_FILE);
if (status == INSTALL_SUCCESS && should_wipe_cache) {
if (!wipe_cache(false, device)) {
status = INSTALL_ERROR;