From 7ab184ec2a211e9d243c8b89ac71be6f43117c93 Mon Sep 17 00:00:00 2001
From: "Singh, Sapna1" <sapna1.singh@intel.com>
Date: Fri, 14 Apr 2023 23:32:57 +0530
Subject: [PATCH] Fix for UI not coming when page reloaded with camera app open
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Whenever camera is opened and URL is reloaded, camera close will be
called from framework and on the other side streamer will send
capability request to the camera-vhal. camera vhal ignores the
capability request as it is received when the camera is in opened
state. Streamer is stuck waiting for the response to capability
request which results in no UI streamed out.

Fix the issue by handling capability request even when camera 
is in opened state in camera vhal.

Tracked-On: OAM-108772
Signed-off-by: Singh, Sapna1 <sapna1.singh@intel.com>
---
 src/ClientCommunicator.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/ClientCommunicator.cpp b/src/ClientCommunicator.cpp
index c4052dc..7ed26be 100644
--- a/src/ClientCommunicator.cpp
+++ b/src/ClientCommunicator.cpp
@@ -238,12 +238,12 @@ void ClientCommunicator::handleCameraInfo(uint32_t header_size) {
         }
         mValidClientCapInfo = IsValidClientCapInfo;
     }
+    sendAck();
 }
 
 
 void ClientCommunicator::sendAck() {
     ALOGVV("%s(%d) Enter", __FUNCTION__, mClientId);
-    Mutex::Autolock al(mMutex);
     size_t ack_packet_size = sizeof(camera_header_t) + sizeof(camera_ack_t);
     camera_ack_t ack_payload = ACK_CONFIG;
     camera_packet_t *ack_packet = NULL;
@@ -352,11 +352,11 @@ bool ClientCommunicator::clientThread() {
                             if ((mCameraSessionState != CameraSessionState::kCameraOpened)
                                 && (mCameraSessionState != CameraSessionState::kDecodingStarted)) {
                                 gVirtualCameraFactory.clearCameraInfo(mClientId);
-                                sendCameraCapabilities();
-			    } else {
+                            } else {
                                 ALOGE("%s(%d): Camera is in opened or decoding state,"
                                       "avoid clearing the cameras", __FUNCTION__, mClientId);
                             }
+                            sendCameraCapabilities();
                             break;
                         case CAMERA_INFO:
                             mValidClientCapInfo = false;
@@ -373,7 +373,6 @@ bool ClientCommunicator::clientThread() {
 				mNumOfCamerasRequested = (header.size) / sizeof(camera_info_t);
                                 handleCameraInfo(header.size);
                             }
-                            sendAck();
                             break;
                         case CAMERA_DATA:
                             if (!mIsConfigurationDone) {