sr: Adjust for changes in sideload code

Change-Id: Iad3b2f7feb45fe497dfe75670ce2779f64a50e60
CyanogenMod · Sep 4, 2016 · f03628f · f03628f
1 parent 758fd99
commit f03628f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/fuse_sideload.h b/fuse_sideload.h
@@ -21,6 +21,8 @@
 #define FUSE_SIDELOAD_HOST_MOUNTPOINT "/sideload"
 #define FUSE_SIDELOAD_HOST_FILENAME "package.zip"
 #define FUSE_SIDELOAD_HOST_PATHNAME (FUSE_SIDELOAD_HOST_MOUNTPOINT "/" FUSE_SIDELOAD_HOST_FILENAME)
+#define FUSE_SIDELOAD_HOST_EXIT_FLAG "exit"
+#define FUSE_SIDELOAD_HOST_EXIT_PATHNAME (FUSE_SIDELOAD_HOST_MOUNTPOINT "/" FUSE_SIDELOAD_HOST_EXIT_FLAG)
 
 struct provider_vtab {
     // read a block

diff --git a/install.cpp b/install.cpp
@@ -406,7 +406,7 @@ really_install_package(const char *path, bool* wipe_cache, bool needs_mount,
     // setjmp/longjmp.
     signal(SIGBUS, sig_bus);
     if (setjmp(jb) == 0) {
-        err = verify_file(map.addr, map.length, loadedKeys, numKeys);
+        err = verify_file(map.addr, map.length, loadedKeys);
         std::chrono::duration<double> duration = std::chrono::system_clock::now() - t0;
         ui->Print("Update package verification took %.1f s (result %d).\n", duration.count(), err);
     } else {