am b1f23f9b: am 10aea802: Merge "Workaround of the face detection failure on L and N5" into ub-camera-haleakala

* commit 'b1f23f9b60e28c814828e3a87652ef5580c647f4':
  Workaround of the face detection failure on L and N5

1 files changed, 15 insertions, 2 deletions

diff --git a/src/com/android/camera/one/v2/initialization/PreviewStarter.java b/src/com/android/camera/one/v2/initialization/PreviewStarter.java
index bba0f54b2..99c34a348 100644
--- a/src/com/android/camera/one/v2/initialization/PreviewStarter.java
+++ b/src/com/android/camera/one/v2/initialization/PreviewStarter.java
@@ -20,6 +20,7 @@ import android.view.Surface;
 
 import com.android.camera.one.OneCamera;
 import com.android.camera.one.v2.camera2proxy.CameraCaptureSessionProxy;
+import com.android.camera.util.ApiHelper;
 import com.google.common.util.concurrent.AsyncFunction;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
@@ -63,8 +64,20 @@ class PreviewStarter {
      */
     public ListenableFuture<Void> startPreview(final Surface surface) {
         // When we have the preview surface, start the capture session.
-        List<Surface> surfaceList = new ArrayList<Surface>(mOutputSurfaces);
-        surfaceList.add(surface);
+        List<Surface> surfaceList = new ArrayList<>();
+
+        // Workaround of the face detection failure on Nexus 5 and L. (b/21039466)
+        // Need to create a capture session with the single preview stream first
+        // to lock it as the first stream. Then resend the another session with preview
+        // and JPEG stream.
+        if (ApiHelper.isLorLMr1() && ApiHelper.IS_NEXUS_5) {
+            surfaceList.add(surface);
+            mCaptureSessionCreator.createCaptureSession(surfaceList);
+            surfaceList.addAll(mOutputSurfaces);
+        } else {
+            surfaceList.addAll(mOutputSurfaces);
+            surfaceList.add(surface);
+        }
 
         final ListenableFuture<CameraCaptureSessionProxy> sessionFuture =
                 mCaptureSessionCreator.createCaptureSession(surfaceList);