commit bfdb4faaf2fea5c6db8ef0484ca39ab9bf0d77e8
author Jin Qian <jinqian@google.com> Thu Nov 03 17:42:03 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Nov 03 17:42:03 2016 +0000
tree 5323af2a84794353f0871eab4e2aade2e7f22887
parent cabf2ae2d821650deec466e8f31e5b9c7dc7a85c
parent 3da704b617b5943137add73676ae327118806a73

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

Change-Id: I9d76ef0bbdaeaf615ace173e92cda64f6dcd6e5e

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;