ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

adb: fix use of wrong union variant.

Browse source 
Also, prepare to add more compression flags.

Bug: https://issuetracker.google.com/150827486
Test: none
Change-Id: I5044e5d5944aff5c18241fd7439baa48e2e09980
This commit is contained in:
Josh Gao 2020-04-01 13:31:07 -07:00
parent 4da40a9a5b
commit 2165717875
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;