commit d00ca7d3b73bd5a2b67342714cfc75fff38c3dce
author Elliott Hughes <enh@google.com> Tue Aug 25 18:15:53 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Aug 25 18:15:53 2015 +0000
tree 7f9181d4a19696f3bcc92e8112b62af496ddd794
parent 08d94ed83ba4e40cfb41317ff846e0bbbf4aeee2
parent 9011bddd1143b18f7f16991565915e4f34a23303

am a0f02fa9: Merge "Fix the fs_config call."

* commit 'a0f02fa9e3ca779ed69264fc0977f530328c3f15':
  Fix the fs_config call.

adb/file_sync_service.cpp

diff --git a/adb/file_sync_service.cpp b/adb/file_sync_service.cpp
index abf1c02..cadf5b3 100644
--- a/adb/file_sync_service.cpp
+++ b/adb/file_sync_service.cpp
@@ -305,7 +305,7 @@
     gid_t gid = -1;
     uint64_t cap = 0;
     if (should_use_fs_config(path)) {
-        unsigned int broken_api_hack;
+        unsigned int broken_api_hack = mode;
         fs_config(path.c_str(), 0, &uid, &gid, &broken_api_hack, &cap);
         mode = broken_api_hack;
     }