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

adb: fix use of wrong union variant. am: 2165717875

Browse source 
Change-Id: I113892ca335419cb0eea8557e554497ed219aad3
This commit is contained in:
Josh Gao 2020-04-07 21:40:13 +00:00 committed by Automerger Merge Worker
commit 906ae0d9b0
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
adb/daemon/file_sync_service.cpp
View file

@ -558,11 +558,13 @@ static bool do_send_v2(int s, const std::string& path, std::vector<char>& buffer
}
std::optional<CompressionType> compression;
uint32_t orig_flags = msg.send_v2_setup.flags;
if (msg.send_v2_setup.flags & kSyncFlagBrotli) {
msg.send_v2_setup.flags &= ~kSyncFlagBrotli;
if (compression) {
SendSyncFail(s, android::base::StringPrintf("multiple compression flags received: %d",
msg.recv_v2_setup.flags));
orig_flags));
return false;
}
compression = CompressionType::Brotli;
@ -676,11 +678,12 @@ static bool do_recv_v2(borrowed_fd s, const char* path, std::vector<char>& buffe
}
std::optional<CompressionType> compression;
uint32_t orig_flags = msg.recv_v2_setup.flags;
if (msg.recv_v2_setup.flags & kSyncFlagBrotli) {
msg.recv_v2_setup.flags &= ~kSyncFlagBrotli;
if (compression) {
SendSyncFail(s, android::base::StringPrintf("multiple compression flags received: %d",
msg.recv_v2_setup.flags));
orig_flags));
return false;
}
compression = CompressionType::Brotli;