commit 2697c01c5462e343d43592ee34f5e684267dac22
author Elliott Hughes <enh@google.com> Tue Aug 25 11:23:27 2015 -0700
committer Elliott Hughes <enh@google.com> Tue Aug 25 11:23:27 2015 -0700
tree bdec64808ab1994bdaccc7f802b1b6158295755d
parent 49fd2afb77394e993863e307066c361dfd5012fb
parent 08d94ed83ba4e40cfb41317ff846e0bbbf4aeee2

resolved conflicts for merge of 3ecba7f9 to mnc-dr-dev-plus-aosp

Change-Id: Id62f6da9c0194facd91ad77c2ae4c115e68cd8a5

adb/file_sync_service.cpp

diff --git a/adb/file_sync_service.cpp b/adb/file_sync_service.cpp
index 0e9aeba..85170ad 100644
--- a/adb/file_sync_service.cpp
+++ b/adb/file_sync_service.cpp
@@ -305,7 +305,9 @@
     gid_t gid = -1;
     uint64_t cap = 0;
     if (should_use_fs_config(path)) {
-        fs_config(path.c_str(), 0, nullptr, &uid, &gid, &mode, &cap);
+        unsigned int broken_api_hack;
+        fs_config(path.c_str(), 0, nullptr, &uid, &gid, &broken_api_hack, &cap);
+        mode = broken_api_hack;
     }
     return handle_send_file(s, path.c_str(), uid, gid, mode, buffer, do_unlink);
 }