diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2020-10-02 23:05:21 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-10-02 23:05:21 +0000 |
| commit | 69522b36f776a2a8ad7e2ce69cfb58f60165b3d5 (patch) | |
| tree | 0b612fef318911b80ec31d8bae2204b0becf66ea | |
| parent | fc6366c95302e7c1ec9836cff477593f2e4e3fd7 (diff) | |
| parent | f11b01fc87dd0c84f1ff460f19fe1caf78097100 (diff) | |
| download | core-android11-qpr1-s2-release.tar.gz | |
Snap for 6880396 from f11b01fc87dd0c84f1ff460f19fe1caf78097100 to rvc-qpr1-releaseandroid-11.0.0_r28android-11.0.0_r27android-11.0.0_r26android-11.0.0_r24android-11.0.0_r23android-11.0.0_r22android-11.0.0_r21android-11.0.0_r20android-11.0.0_r19android-11.0.0_r18android11-qpr1-s2-releaseandroid11-qpr1-s1-releaseandroid11-qpr1-d-s1-release
Change-Id: Iaeea057cf6e2d5282894e729aca7529302f84d65
| -rw-r--r-- | adb/daemon/usb.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/adb/daemon/usb.cpp b/adb/daemon/usb.cpp index a66387193..50d73644d 100644 --- a/adb/daemon/usb.cpp +++ b/adb/daemon/usb.cpp @@ -584,12 +584,11 @@ struct UsbFfsConnection : public Connection { incoming_header_ = msg; } else { size_t bytes_left = incoming_header_->data_length - incoming_payload_.size(); - Block payload = std::move(block->payload); if (block->payload.size() > bytes_left) { HandleError("received too many bytes while waiting for payload"); return false; } - incoming_payload_.append(std::move(payload)); + incoming_payload_.append(std::move(block->payload)); } if (incoming_header_->data_length == incoming_payload_.size()) { |