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

Commit 2dab1fe4 authored by Eino-Ville Talvala's avatar Eino-Ville Talvala Committed by Gerrit Code Review
Browse files

Merge "CameraService: Fix cameraId type of onDeviceStatusChanged"

parents 15ca7841 e16d1165

services/camera/libcameraservice/CameraService.cpp

+2 −2
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ static void camera_device_status_change( 
    sp<CameraService> cs = const_cast<CameraService*>(

            static_cast<const CameraService*>(callbacks));



    cs->onDeviceStatusChanged(static_cast<camera_device_status_t>(camera_id),

    cs->onDeviceStatusChanged(camera_id,

            static_cast<camera_device_status_t>(new_status));

}
@@ -278,7 +278,7 @@ CameraService::~CameraService() { 
    gCameraService = nullptr;

}



void CameraService::onDeviceStatusChanged(camera_device_status_t  cameraId,

void CameraService::onDeviceStatusChanged(int  cameraId,

        camera_device_status_t newStatus) {

    ALOGI("%s: Status changed for cameraId=%d, newStatus=%d", __FUNCTION__,

          cameraId, newStatus);

services/camera/libcameraservice/CameraService.h

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ public: 


    /////////////////////////////////////////////////////////////////////

    // HAL Callbacks

    virtual void        onDeviceStatusChanged(camera_device_status_t cameraId,

    virtual void        onDeviceStatusChanged(int cameraId,

                                              camera_device_status_t newStatus);

    virtual void        onTorchStatusChanged(const String8& cameraId,

                                             ICameraServiceListener::TorchStatus