diff options
| author | Justin DeMartino <jjdemartino@google.com> | 2020-10-14 19:39:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-10-14 19:39:53 +0000 |
| commit | 0d11af03e43f110b0bb160f7e20436d0043e3038 (patch) | |
| tree | 48f8bcca856276ec73a86dd3fb26143d3ca64578 /adb/client/file_sync_client.cpp | |
| parent | 075666ebd0dee8d0c4a2efa54f7c324a3f67ee2a (diff) | |
| parent | a6c01e4e98d2b343dcecfc99611e2e6250c730db (diff) | |
Merge changes from topic "SP1A.200921.001" into s-keystone-qcom-dev
* changes:
fs_mgr: adb-remount-test.sh: filter out more administrivia mounts.
Merge SP1A.200921.001 Change-Id: I90b97c4e9fb10b1f45e74def404823eed5b1aaa8
Diffstat (limited to 'adb/client/file_sync_client.cpp')
| -rw-r--r-- | adb/client/file_sync_client.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/adb/client/file_sync_client.cpp b/adb/client/file_sync_client.cpp index 8bbe2a878..2e8b97566 100644 --- a/adb/client/file_sync_client.cpp +++ b/adb/client/file_sync_client.cpp @@ -1053,7 +1053,7 @@ static bool sync_send(SyncConnection& sc, const std::string& lpath, const std::s if (!sc.SendSmallFile(rpath, mode, lpath, rpath, mtime, buf, data_length, dry_run)) { return false; } - return sc.ReadAcknowledgements(); + return sc.ReadAcknowledgements(sync); #endif } @@ -1077,7 +1077,7 @@ static bool sync_send(SyncConnection& sc, const std::string& lpath, const std::s return false; } } - return sc.ReadAcknowledgements(); + return sc.ReadAcknowledgements(sync); } static bool sync_recv_v1(SyncConnection& sc, const char* rpath, const char* lpath, const char* name, |