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

Merge "Allow OTA package size larger than 2GiB(2147483647 bytes) on sideload."

Browse source 
am: b32bd8a333

Change-Id: I69e31f6c34da79ca7ae3600b97941717ff3d48b6
This commit is contained in:
Tao Bao 2018-09-27 09:55:48 -07:00 committed by android-build-merger
commit f4bf630200
1 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
minadbd/minadbd_services.cpp
View file

@ -33,19 +33,20 @@
#include "sysdeps.h" #include "sysdeps.h"
static void sideload_host_service(unique_fd sfd, const std::string& args) { static void sideload_host_service(unique_fd sfd, const std::string& args) {
int file_size; int64_t file_size;
int block_size; int block_size;
if (sscanf(args.c_str(), "%d:%d", &file_size, &block_size) != 2) { if ((sscanf(args.c_str(), "%" SCNd64 ":%d", &file_size, &block_size) != 2) || file_size <= 0 ||
printf("bad sideload-host arguments: %s\n", args.c_str()); block_size <= 0) {
exit(1); printf("bad sideload-host arguments: %s\n", args.c_str());
} exit(1);
}
printf("sideload-host file size %d block size %d\n", file_size, block_size); printf("sideload-host file size %" PRId64 " block size %d\n", file_size, block_size);
int result = run_adb_fuse(sfd, file_size, block_size); int result = run_adb_fuse(sfd, file_size, block_size);
printf("sideload_host finished\n"); printf("sideload_host finished\n");
exit(result == 0 ? 0 : 1); exit(result == 0 ? 0 : 1);
} }
unique_fd daemon_service_to_fd(const char* name, atransport* /* transport */) { unique_fd daemon_service_to_fd(const char* name, atransport* /* transport */) {