openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

adb: correctly fix merge conflict. 

am: 1286c1f878

Change-Id: I865cc05bef06ec33941766993e6aef2171be3e67
This commit is contained in:
Josh Gao 2016-08-05 16:00:50 +00:00 committed by android-build-merger
parent aef02526b5 1286c1f878
commit d067dcdaa3
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);