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

Merge "Set file capabilities after writing file data"

Browse source 
am: dd4e5ae943

Change-Id: I135c6ebf4fc9b11a7ed9798be1ce0a88862386a5
This commit is contained in:
Jin Qian 2016-11-03 17:29:31 +00:00 • committed by android-build-merger
commit c6fbcd7579
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
adb/file_sync_service.cpp
View file

@ -198,11 +198,6 @@ static bool handle_send_file(int s, const char* path, uid_t uid, gid_t gid, uint
// Ignore the result of calling fchmod. It's not supported
// by all filesystems, so we don't check for success. b/12441485
fchmod(fd, mode);
if (!update_capabilities(path, capabilities)) {
SendSyncFailErrno(s, "update_capabilities failed");
goto fail;
}
}
while (true) {
@ -232,6 +227,11 @@ static bool handle_send_file(int s, const char* path, uid_t uid, gid_t gid, uint
adb_close(fd);
if (!update_capabilities(path, capabilities)) {
SendSyncFailErrno(s, "update_capabilities failed");
goto fail;
}
utimbuf u;
u.actime = timestamp;
u.modtime = timestamp;