commit 9d2189ffcf1142b2948ce3065c32521ed7d966c4
author Zhijun He <zhijunhe@google.com> Tue Oct 14 23:31:50 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Oct 14 23:31:50 2014 +0000
tree cd4281f83d3cd3bb783f781b648d35f764ffa9cf
parent 95740336c7ca5c9dc290a1eb5a193d9a91fd6c0a
parent 96ff5c48a81f3f45c384113480bf5e28620a72ae

Merge "Camera2Client: avoid two consecutive sets of configure_streams calls" into lmp-dev

services/camera/libcameraservice/api1/Camera2Client.cpp

diff --git a/services/camera/libcameraservice/api1/Camera2Client.cpp b/services/camera/libcameraservice/api1/Camera2Client.cpp
index 3610362..2a6aa7b 100644
--- a/services/camera/libcameraservice/api1/Camera2Client.cpp
+++ b/services/camera/libcameraservice/api1/Camera2Client.cpp
@@ -995,6 +995,10 @@
         case Parameters::STOPPED:
             res = startPreviewL(params, false);
             if (res != OK) return res;
+            // Make sure first preview request is submitted to the HAL device to avoid
+            // two consecutive set of configure_streams being called into the HAL.
+            // TODO: Refactor this to avoid initial preview configuration.
+            syncWithDevice();
             break;
         case Parameters::PREVIEW:
             // Ready to go