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

resolved conflicts for merge of 068ee4d0 to mnc-dev-plus-aosp

Browse source 
Change-Id: If276934797138d13fe8c56711615b477e05ee484
This commit is contained in:
Elliott Hughes 2015-08-25 11:24:45 -07:00
commit 9ccf4bfbde
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
adb/file_sync_service.cpp
View file

@ -305,7 +305,7 @@ static bool do_send(int s, const std::string& spec, std::vector<char>& buffer) {
gid_t gid = -1; gid_t gid = -1;
uint64_t cap = 0; uint64_t cap = 0;
if (should_use_fs_config(path)) { if (should_use_fs_config(path)) {
unsigned int broken_api_hack; unsigned int broken_api_hack = mode;
fs_config(path.c_str(), 0, nullptr, &uid, &gid, &broken_api_hack, &cap); fs_config(path.c_str(), 0, nullptr, &uid, &gid, &broken_api_hack, &cap);
mode = broken_api_hack; mode = broken_api_hack;
} }