commit 2165717875ee15aea112f63744780cae26d6b4c4
author Josh Gao <jmgao@google.com> Wed Apr 01 13:31:07 2020 -0700
committer Josh Gao <jmgao@google.com> Thu Apr 02 17:11:07 2020 -0700
tree a440b2e5affa9806176e316134587dceb9dcaed4
parent 4da40a9a5bcdb9491de41464687aad53fa96f721

adb: fix use of wrong union variant.

Also, prepare to add more compression flags.

Bug: https://issuetracker.google.com/150827486
Test: none
Change-Id: I5044e5d5944aff5c18241fd7439baa48e2e09980

adb/daemon/file_sync_service.cpp

diff --git a/adb/daemon/file_sync_service.cpp b/adb/daemon/file_sync_service.cpp
index dcd640b..3138ab4 100644
--- a/adb/daemon/file_sync_service.cpp
+++ b/adb/daemon/file_sync_service.cpp
@@ -558,11 +558,13 @@
     }
 
     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 @@
     }
 
     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;