commit e5dd4048d262f49f3231d1a6b7cd7c128210b0b7
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Jul 17 00:24:29 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jul 17 00:24:29 2020 +0000
tree 4c39f75ee54b45f4d26fe65facfad438aad0f20d
parent 127b0dba8aa56e27160d2a579f58993b995acd62
parent 2f7af40d26c85ef3d3a0b25a520aaad2ed54f064

Merge "Fix audio HAL restart sequence to improve uptime" into rvc-qpr-dev

services/camera/libcameraservice/device3/Camera3OutputUtils.cpp

diff --git a/services/camera/libcameraservice/device3/Camera3OutputUtils.cpp b/services/camera/libcameraservice/device3/Camera3OutputUtils.cpp
index eea5ef1..08cde5d 100644
--- a/services/camera/libcameraservice/device3/Camera3OutputUtils.cpp
+++ b/services/camera/libcameraservice/device3/Camera3OutputUtils.cpp
@@ -1218,13 +1218,13 @@
             return;
         }
 
+        bufRet.streamId = streamId;
         if (outputStream->isAbandoned()) {
             bufRet.val.error(StreamBufferRequestError::STREAM_DISCONNECTED);
             allReqsSucceeds = false;
             continue;
         }
 
-        bufRet.streamId = streamId;
         size_t handOutBufferCount = outputStream->getOutstandingBuffersCount();
         uint32_t numBuffersRequested = bufReq.numBuffersRequested;
         size_t totalHandout = handOutBufferCount + numBuffersRequested;