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

Commit e16d1165 authored by Bin Chen's avatar Bin Chen
Browse files

CameraService: Fix cameraId type of onDeviceStatusChanged



The cameraId should be of type int, instead of camera_device_status_t.

Change-Id: I26d587bb74f7100028f09928984c2e8dad6eebef
Signed-off-by: default avatarBin Chen <chen_bin@projectara.com>
parent 15ca7841
Loading
Loading
Loading
Loading
+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);
+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