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

adb_install: Stop passing RecoveryUI as a parameter.

Browse source 
It's already a global declared in common.h which is included by
adb_install.cpp.

Remove '#include "minadbd/fuse_adb_provider.h"' that's not needed by
adb_install.cpp (minadbd takes care of that).

Test: mmma bootable/recovery
Change-Id: I6d08b7abc706b4b05de2ef46a57ced2204ad297e
This commit is contained in:
Tao Bao 2017-05-01 11:31:28 -07:00
parent 54da112277
commit 0150d013eb
3 changed files with 92 additions and 97 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

181
adb_install.cpp
View file

@ -14,124 +14,121 @@
* limitations under the License. * limitations under the License.
*/ */
#include <unistd.h> #include "adb_install.h"
#include <dirent.h>
#include <errno.h> #include <errno.h>
#include <fcntl.h>
#include <signal.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <sys/stat.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/wait.h> #include <sys/wait.h>
#include <sys/stat.h> #include <unistd.h>
#include <signal.h>
#include <fcntl.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 <android-base/properties.h> #include <android-base/properties.h>
static void set_usb_driver(RecoveryUI* ui, bool enabled) { #include "common.h"
int fd = open("/sys/class/android_usb/android0/enable", O_WRONLY); #include "fuse_sideload.h"
if (fd < 0) { #include "install.h"
ui->Print("failed to open driver control: %s\n", strerror(errno)); #include "ui.h"
return;
} static void set_usb_driver(bool enabled) {
if (TEMP_FAILURE_RETRY(write(fd, enabled ? "1" : "0", 1)) == -1) { int fd = open("/sys/class/android_usb/android0/enable", O_WRONLY);
ui->Print("failed to set driver control: %s\n", strerror(errno)); if (fd < 0) {
} ui->Print("failed to open driver control: %s\n", strerror(errno));
if (close(fd) < 0) { return;
ui->Print("failed to close driver control: %s\n", strerror(errno)); }
} 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) { static void stop_adbd() {
ui->Print("Stopping adbd...\n"); ui->Print("Stopping adbd...\n");
android::base::SetProperty("ctl.stop", "adbd"); android::base::SetProperty("ctl.stop", "adbd");
set_usb_driver(ui, false); set_usb_driver(false);
} }
static void maybe_restart_adbd(RecoveryUI* ui) { static void maybe_restart_adbd() {
if (is_ro_debuggable()) { if (is_ro_debuggable()) {
ui->Print("Restarting adbd...\n"); ui->Print("Restarting adbd...\n");
set_usb_driver(ui, true); set_usb_driver(true);
android::base::SetProperty("ctl.start", "adbd"); android::base::SetProperty("ctl.start", "adbd");
} }
} }
// How long (in seconds) we wait for the host to start sending us a int apply_from_adb(bool* wipe_cache, const char* install_file) {
// package, before timing out. modified_flash = true;
#define ADB_INSTALL_TIMEOUT 300
int apply_from_adb(RecoveryUI* ui, bool* wipe_cache, const char* install_file) { stop_adbd();
modified_flash = true; set_usb_driver(true);
stop_adbd(ui); ui->Print(
set_usb_driver(ui, true); "\n\nNow send the package you want to apply\n"
"to the device with \"adb sideload <filename>\"...\n");
ui->Print("\n\nNow send the package you want to apply\n" pid_t child;
"to the device with \"adb sideload <filename>\"...\n"); if ((child = fork()) == 0) {
execl("/sbin/recovery", "recovery", "--adbd", nullptr);
_exit(EXIT_FAILURE);
}
pid_t child; // How long (in seconds) we wait for the host to start sending us a package, before timing out.
if ((child = fork()) == 0) { static constexpr int ADB_INSTALL_TIMEOUT = 300;
execl("/sbin/recovery", "recovery", "--adbd", NULL);
_exit(EXIT_FAILURE); // 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; struct stat st;
for (int i = 0; i < ADB_INSTALL_TIMEOUT; ++i) { if (stat(FUSE_SIDELOAD_HOST_PATHNAME, &st) != 0) {
if (waitpid(child, &status, WNOHANG) != 0) { if (errno == ENOENT && i < ADB_INSTALL_TIMEOUT - 1) {
result = INSTALL_ERROR; sleep(1);
waited = true; continue;
break; } else {
} ui->Print("\nTimed out waiting for package.\n\n");
result = INSTALL_ERROR;
if (stat(FUSE_SIDELOAD_HOST_PATHNAME, &st) != 0) { kill(child, SIGKILL);
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; break;
}
} }
result = install_package(FUSE_SIDELOAD_HOST_PATHNAME, wipe_cache, install_file, false, 0);
break;
}
if (!waited) { if (!waited) {
// Calling stat() on this magic filename signals the minadbd // Calling stat() on this magic filename signals the minadbd subprocess to shut down.
// subprocess to shut down. struct stat st;
stat(FUSE_SIDELOAD_HOST_EXIT_PATHNAME, &st); stat(FUSE_SIDELOAD_HOST_EXIT_PATHNAME, &st);
// TODO(dougz): there should be a way to cancel waiting for a // TODO: there should be a way to cancel waiting for a package (by pushing some button combo on
// package (by pushing some button combo on the device). For now // the device). For now you just have to 'adb sideload' a file that's not a valid package, like
// you just have to 'adb sideload' a file that's not a valid // "/dev/null".
// package, like "/dev/null". waitpid(child, &status, 0);
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 (!WIFEXITED(status) || WEXITSTATUS(status) != 0) { set_usb_driver(false);
if (WEXITSTATUS(status) == 3) { maybe_restart_adbd();
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); return result;
maybe_restart_adbd(ui);
return result;
} }

4
adb_install.h
View file

@ -17,8 +17,6 @@
#ifndef _ADB_INSTALL_H #ifndef _ADB_INSTALL_H
#define _ADB_INSTALL_H #define _ADB_INSTALL_H
class RecoveryUI; int apply_from_adb(bool* wipe_cache, const char* install_file);
int apply_from_adb(RecoveryUI* h, bool* wipe_cache, const char* install_file);
#endif #endif

4
recovery.cpp
View file

@ -1155,7 +1155,7 @@ static Device::BuiltinAction prompt_and_wait(Device* device, int status) {
{ {
bool adb = (chosen_action == Device::APPLY_ADB_SIDELOAD); bool adb = (chosen_action == Device::APPLY_ADB_SIDELOAD);
if (adb) { if (adb) {
status = apply_from_adb(ui, &should_wipe_cache, TEMPORARY_INSTALL_FILE); status = apply_from_adb(&should_wipe_cache, TEMPORARY_INSTALL_FILE);
} else { } else {
status = apply_from_sdcard(device, &should_wipe_cache); status = apply_from_sdcard(device, &should_wipe_cache);
} }
@ -1584,7 +1584,7 @@ int main(int argc, char **argv) {
if (!sideload_auto_reboot) { if (!sideload_auto_reboot) {
ui->ShowText(true); 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 (status == INSTALL_SUCCESS && should_wipe_cache) {
if (!wipe_cache(false, device)) { if (!wipe_cache(false, device)) {
status = INSTALL_ERROR; status = INSTALL_ERROR;