diff options
author | Ethan Yonker <dees_troy@teamw.in> | 2014-11-06 16:49:25 +0100 |
---|---|---|
committer | Ethan Yonker <dees_troy@teamw.in> | 2014-11-06 16:49:25 +0100 |
commit | 26860098e8716628f15422af268c5186c76c1b1b (patch) | |
tree | e21e8b799369e535f4a112783919aae079b3a35b /adb_install.cpp | |
parent | Fix some includes that are not longer present (diff) | |
download | android_bootable_recovery-26860098e8716628f15422af268c5186c76c1b1b.tar android_bootable_recovery-26860098e8716628f15422af268c5186c76c1b1b.tar.gz android_bootable_recovery-26860098e8716628f15422af268c5186c76c1b1b.tar.bz2 android_bootable_recovery-26860098e8716628f15422af268c5186c76c1b1b.tar.lz android_bootable_recovery-26860098e8716628f15422af268c5186c76c1b1b.tar.xz android_bootable_recovery-26860098e8716628f15422af268c5186c76c1b1b.tar.zst android_bootable_recovery-26860098e8716628f15422af268c5186c76c1b1b.zip |
Diffstat (limited to 'adb_install.cpp')
-rw-r--r-- | adb_install.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/adb_install.cpp b/adb_install.cpp index e10cb4a2e..c731d1cd2 100644 --- a/adb_install.cpp +++ b/adb_install.cpp @@ -107,11 +107,12 @@ apply_from_adb(const char* install_file) { // appearance. (Note that inotify doesn't work with FUSE.) int result; int status; + int wipe_cache; bool waited = false; struct stat st; for (int i = 0; i < ADB_INSTALL_TIMEOUT; ++i) { if (waitpid(child, &status, WNOHANG) != 0) { - result = INSTALL_ERROR; + result = -1; waited = true; break; } @@ -121,13 +122,14 @@ apply_from_adb(const char* install_file) { sleep(1); continue; } else { - ui->Print("\nTimed out waiting for package.\n\n", strerror(errno)); - result = INSTALL_ERROR; + printf("\nTimed out waiting for package.\n\n", strerror(errno)); + result = -1; kill(child, SIGKILL); break; } } - result = install_package(FUSE_SIDELOAD_HOST_PATHNAME, wipe_cache, install_file, false); + printf("FIX ME: need to make adb sideload actually install the file!\n"); + //result = install_package(FUSE_SIDELOAD_HOST_PATHNAME, wipe_cache, install_file, false); break; } |