commit 82b8a5087f94af8bbe5f23f3d22184df5c77713e
author Akash Malik <malikakash@google.com> Tue Sep 26 02:06:38 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Sep 26 02:06:38 2023 +0000
tree 8dace0371fb9df4ada3eb2e33988257b04287117
parent df2c531b850e9761c45e660f7aabd9350f04601a
parent bd096f1ee498f3503675c6af9a5f4b7024b539d6

Merge "Use ERROR_CAMERA_DISCONNECTED on id remap" into main

services/camera/libcameraservice/CameraService.cpp

diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp
index 0d24838..61b667b 100644
--- a/services/camera/libcameraservice/CameraService.cpp
+++ b/services/camera/libcameraservice/CameraService.cpp
@@ -924,10 +924,8 @@
     }
 
     for (auto& clientSp : clientsToDisconnect) {
-        // We send up ERROR_CAMERA_DEVICE so that the app attempts to reconnect
-        // automatically. Note that this itself can cause clientSp->disconnect() based on the
-        // app's response.
-        clientSp->notifyError(hardware::camera2::ICameraDeviceCallbacks::ERROR_CAMERA_DEVICE,
+        // Notify the clients about the disconnection.
+        clientSp->notifyError(hardware::camera2::ICameraDeviceCallbacks::ERROR_CAMERA_DISCONNECTED,
                 CaptureResultExtras{});
     }