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

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

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

4
adb/file_sync_service.cpp
View file

@ -305,7 +305,9 @@ 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)) {
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); return handle_send_file(s, path.c_str(), uid, gid, mode, buffer, do_unlink);
} }