Merge "Set file capabilities after writing file data" (dd4e5ae9) · Commits · e / os / android_system_core

adb/file_sync_service.cpp

+5 −5

Original line number	Diff line number	Diff line
		@@ -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;