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

adb: correctly fix merge conflict.

Browse source 
Change-Id: Ic637c0ef5499e2893cd0adfcc41dd5d3481524c2
This commit is contained in:
Josh Gao 2016-08-05 00:39:16 -07:00
parent 4ff7f9f62a
commit 1286c1f878
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
adb/file_sync_client.cpp
View file

@ -677,9 +677,8 @@ static bool sync_recv(SyncConnection& sc, const char* rpath, const char* lpath,
bytes_copied += msg.data.size;
sc.ReportProgress(name != nullptr ? name : rpath, bytes_copied, size);
sc.RecordBytesTransferred(msg.data.size);
sc.ReportProgress(rpath, bytes_copied, size);
sc.ReportProgress(name != nullptr ? name : rpath, bytes_copied, size);
}
sc.RecordFilesTransferred(1);