This will probably not compile and may need additional work. For tracking purposes so we know what might still need looking at as none of this has been compiled and tested, here is a list of the merge conflicts that I attempted to fix before pushing this set of changes: git pull aosp lollipop-release remote: Finding sources: 100% (992/992) remote: Total 992 (delta 473), reused 992 (delta 473) Receiving objects: 100% (992/992), 1.51 MiB | 516.00 KiB/s, done. Resolving deltas: 100% (473/473), completed with 42 local objects. From https://android.googlesource.com/platform/bootable/recovery * branch lollipop-release -> FETCH_HEAD * [new branch] lollipop-release -> aosp/lollipop-release Auto-merging verifier_test.cpp CONFLICT (content): Merge conflict in verifier_test.cpp Auto-merging verifier.h CONFLICT (content): Merge conflict in verifier.h Auto-merging verifier.cpp CONFLICT (content): Merge conflict in verifier.cpp Auto-merging updater/updater.c Auto-merging updater/install.c CONFLICT (content): Merge conflict in updater/install.c Auto-merging updater/Android.mk CONFLICT (content): Merge conflict in updater/Android.mk Auto-merging uncrypt/Android.mk CONFLICT (content): Merge conflict in uncrypt/Android.mk Auto-merging ui.cpp CONFLICT (content): Merge conflict in ui.cpp Auto-merging screen_ui.cpp Auto-merging roots.cpp CONFLICT (content): Merge conflict in roots.cpp CONFLICT (rename/delete): res-hdpi/images/progress_fill.png deleted in HEAD and renamed incddb68b5ea. Versioncddb68b5eaof res-hdpi/images/progress_fill.png left in tree. CONFLICT (rename/delete): res-hdpi/images/progress_empty.png deleted in HEAD and renamed incddb68b5ea. Versioncddb68b5eaof res-hdpi/images/progress_empty.png left in tree. CONFLICT (rename/delete): res-hdpi/images/icon_error.png deleted in HEAD and renamed incddb68b5ea. Versioncddb68b5eaof res-hdpi/images/icon_error.png left in tree. Auto-merging recovery.cpp CONFLICT (content): Merge conflict in recovery.cpp Auto-merging minui/resources.c CONFLICT (content): Merge conflict in minui/resources.c Auto-merging minui/minui.h CONFLICT (content): Merge conflict in minui/minui.h Auto-merging minui/graphics.c CONFLICT (content): Merge conflict in minui/graphics.c Auto-merging minui/Android.mk CONFLICT (content): Merge conflict in minui/Android.mk Removing minelf/Retouch.h Removing minelf/Retouch.c Auto-merging minadbd/usb_linux_client.c CONFLICT (content): Merge conflict in minadbd/usb_linux_client.c Auto-merging minadbd/adb.h CONFLICT (content): Merge conflict in minadbd/adb.h Auto-merging minadbd/adb.c CONFLICT (content): Merge conflict in minadbd/adb.c Auto-merging minadbd/Android.mk CONFLICT (content): Merge conflict in minadbd/Android.mk Removing make-overlay.py Auto-merging install.h CONFLICT (content): Merge conflict in install.h Auto-merging etc/init.rc CONFLICT (content): Merge conflict in etc/init.rc Auto-merging bootloader.h Auto-merging applypatch/applypatch.c Auto-merging applypatch/Android.mk CONFLICT (content): Merge conflict in applypatch/Android.mk Auto-merging adb_install.cpp CONFLICT (content): Merge conflict in adb_install.cpp Auto-merging Android.mk CONFLICT (content): Merge conflict in Android.mk Automatic merge failed; fix conflicts and then commit the result. Change-Id: I3e0e03e48ad8550912111c7a5c9a140ed0267e2c
166 lines
4.8 KiB
C++
166 lines
4.8 KiB
C++
/*
|
|
* Copyright (C) 2012 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#include <unistd.h>
|
|
#include <dirent.h>
|
|
#include <errno.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <sys/types.h>
|
|
#include <sys/wait.h>
|
|
#include <sys/stat.h>
|
|
#include <signal.h>
|
|
#include <fcntl.h>
|
|
#include <stdio.h>
|
|
|
|
#include "ui.h"
|
|
#include "cutils/properties.h"
|
|
#include "adb_install.h"
|
|
extern "C" {
|
|
#include "minadbd/fuse_adb_provider.h"
|
|
#include "fuse_sideload.h"
|
|
}
|
|
|
|
static RecoveryUI* ui = NULL;
|
|
|
|
static void
|
|
set_usb_driver(bool enabled) {
|
|
int fd = open("/sys/class/android_usb/android0/enable", O_WRONLY);
|
|
if (fd < 0) {
|
|
/* These error messages show when built in older Android branches (e.g. Gingerbread)
|
|
It's not a critical error so we're disabling the error messages.
|
|
ui->Print("failed to open driver control: %s\n", strerror(errno));
|
|
*/
|
|
printf("failed to open driver control: %s\n", strerror(errno));
|
|
return;
|
|
}
|
|
if (write(fd, enabled ? "1" : "0", 1) < 0) {
|
|
/*
|
|
ui->Print("failed to set driver control: %s\n", strerror(errno));
|
|
*/
|
|
printf("failed to set driver control: %s\n", strerror(errno));
|
|
}
|
|
if (close(fd) < 0) {
|
|
/*
|
|
ui->Print("failed to close driver control: %s\n", strerror(errno));
|
|
*/
|
|
printf("failed to close driver control: %s\n", strerror(errno));
|
|
}
|
|
}
|
|
|
|
static void
|
|
stop_adbd() {
|
|
property_set("ctl.stop", "adbd");
|
|
set_usb_driver(false);
|
|
}
|
|
|
|
|
|
static void
|
|
maybe_restart_adbd() {
|
|
char value[PROPERTY_VALUE_MAX+1];
|
|
int len = property_get("ro.debuggable", value, NULL);
|
|
if (len == 1 && value[0] == '1') {
|
|
printf("Restarting adbd...\n");
|
|
set_usb_driver(true);
|
|
property_set("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(const char* install_file) {
|
|
|
|
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", install_file, NULL);
|
|
_exit(-1);
|
|
}
|
|
|
|
char child_prop[PROPERTY_VALUE_MAX];
|
|
sprintf(child_prop, "%i", child);
|
|
property_set("tw_child_pid", child_prop);
|
|
|
|
// 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;
|
|
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", strerror(errno));
|
|
result = INSTALL_ERROR;
|
|
kill(child, SIGKILL);
|
|
break;
|
|
}
|
|
}
|
|
result = install_package(FUSE_SIDELOAD_HOST_PATHNAME, wipe_cache, install_file, false);
|
|
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) {
|
|
printf("\nYou need adb 1.0.32 or newer to sideload\nto this device.\n\n");
|
|
} else if (!WIFSIGNALED(status)) {
|
|
printf("status %d\n", WEXITSTATUS(status));
|
|
}
|
|
}
|
|
set_usb_driver(false);
|
|
maybe_restart_adbd();
|
|
|
|
if (stat(install_file, &st) != 0) {
|
|
if (errno == ENOENT) {
|
|
printf("No package received.\n");
|
|
} else {
|
|
printf("Error reading package:\n %s\n", strerror(errno));
|
|
}
|
|
return -1;
|
|
}
|
|
return 0;
|
|
}
|