Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d067dcda authored by Josh Gao's avatar Josh Gao Committed by android-build-merger
Browse files

adb: correctly fix merge conflict. 

am: 1286c1f8

Change-Id: I865cc05bef06ec33941766993e6aef2171be3e67
parents aef02526 1286c1f8

adb/file_sync_client.cpp

+1 −2
Original line number Diff line number Diff line
@@ -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);