From 725bd108a7d96d03a8b2ab1432f6beaef6f7fb5c Mon Sep 17 00:00:00 2001
From: Emilian Peev <epeev@google.com>
Date: Thu, 11 Feb 2021 15:43:03 -0800
Subject: [PATCH] Camera: Switch the reader callback when the sequence ends

Depending on timing the first captured buffer from an internal
repeating request can be incorrectly propagated to the client
preview surface. This can happen, if the first 'onCaptureStarted'
callback gets delayed and executes after the first buffer from the
internal request gets queued in the camera preview output surface.
Proactively switch the camera preview output image reader callback
to loopback after the current capture sequence ends.

Bug: 179450326
Test: Camera CTS
Change-Id: I8232ea5171a0205da5705b6af5fdd3cdab297335
---
 .../hardware/camera2/impl/CameraExtensionSessionImpl.java  | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/core/java/android/hardware/camera2/impl/CameraExtensionSessionImpl.java b/core/java/android/hardware/camera2/impl/CameraExtensionSessionImpl.java
index 8fe71583912ca..8451dedb6c37b 100644
--- a/core/java/android/hardware/camera2/impl/CameraExtensionSessionImpl.java
+++ b/core/java/android/hardware/camera2/impl/CameraExtensionSessionImpl.java
@@ -1233,6 +1233,8 @@ public final class CameraExtensionSessionImpl extends CameraExtensionSession {
                                              int sequenceId) {
             synchronized (mInterfaceLock) {
                 if (mInternalRepeatingRequestEnabled) {
+                    mRepeatingRequestImageReader.setOnImageAvailableListener(
+                            new ImageLoopbackCallback(), mHandler);
                     resumeInternalRepeatingRequest(true);
                 }
             }
@@ -1263,7 +1265,12 @@ public final class CameraExtensionSessionImpl extends CameraExtensionSession {
                     mRequestUpdatedNeeded = false;
                     resumeInternalRepeatingRequest(false);
                 } else if (mInternalRepeatingRequestEnabled) {
+                    mRepeatingRequestImageReader.setOnImageAvailableListener(
+                            new ImageLoopbackCallback(), mHandler);
                     resumeInternalRepeatingRequest(true);
+                } else {
+                    mRepeatingRequestImageReader.setOnImageAvailableListener(
+                            new ImageLoopbackCallback(), mHandler);
                 }
             }