commit 3e4025c4f88887726685a44a85e0ada30beb93ab
author Jin Qian <jinqian@google.com> Thu Nov 03 17:32:30 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Nov 03 17:32:30 2016 +0000
tree 4f1e90a7b5883c4a101539a9235013cfc3a21498
parent 67a4cae7c3904694cc60b28939a202b24eaeffd8
parent b76cf23fe7984e7f7be14d6377dbfadc0f66b7e2

Merge "Set file capabilities after writing file data" am: dd4e5ae943
am: c6fbcd7579

Change-Id: Ie1256b68bbf185b640791aac7cb3e5ea63dc1857

adb/file_sync_service.cpp

diff --git a/adb/file_sync_service.cpp b/adb/file_sync_service.cpp
index 837902a..7a92d2e 100644
--- a/adb/file_sync_service.cpp
+++ b/adb/file_sync_service.cpp
@@ -198,11 +198,6 @@
         // 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 @@
 
     adb_close(fd);
 
+    if (!update_capabilities(path, capabilities)) {
+        SendSyncFailErrno(s, "update_capabilities failed");
+        goto fail;
+    }
+
     utimbuf u;
     u.actime = timestamp;
     u.modtime = timestamp;