Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 80ad4940 authored by Ian Pedowitz's avatar Ian Pedowitz Committed by android-build-merger
Browse files

Merge "DO NOT MERGE: libcameraservice: Fix nullptr crash when no client." into mnc-dr-dev 

am: c0d8c35a

* commit 'c0d8c35a':
  DO NOT MERGE: libcameraservice: Fix nullptr crash when no client.
parents 8a7f184c c0d8c35a

services/camera/libcameraservice/CameraService.cpp

+4 −2
Original line number Diff line number Diff line
@@ -315,9 +315,11 @@ void CameraService::onDeviceStatusChanged(camera_device_status_t cameraId, 
            clientToDisconnect = removeClientLocked(id);



            // Notify the client of disconnection

            if (clientToDisconnect != nullptr) {

                clientToDisconnect->notifyError(ICameraDeviceCallbacks::ERROR_CAMERA_DISCONNECTED,

                        CaptureResultExtras{});

            }

        }



        ALOGI("%s: Client for camera ID %s evicted due to device status change from HAL",

                __FUNCTION__, id.string());