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

Commit 3486ab7a authored by Emilian Peev's avatar Emilian Peev
Browse files

Camera: Avoid possible instability when adding new devices 

In cases where camera provider is having issues
"initializeDeviceInfo" may fail to return valid device
information.
Try to avoid possible instabilities and check the return
parameter before trying to access it.

Bug: 204111448
Test: Camera CTS
Change-Id: I3561f38cb7e5aacd9f5f62bda77caddb648a2578
parent 2bcfe35e

services/camera/libcameraservice/common/CameraProviderManager.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1631,7 +1631,6 @@ status_t CameraProviderManager::ProviderInfo::addDevice(const std::string& name, 
        case 3:

            deviceInfo = initializeDeviceInfo<DeviceInfo3>(name, mProviderTagid,

                    id, minor);

            deviceInfo->notifyDeviceStateChange(mDeviceState);

            break;

        default:

            ALOGE("%s: Device %s: Unknown HIDL device HAL major version %d:", __FUNCTION__,
@@ -1639,6 +1638,7 @@ status_t CameraProviderManager::ProviderInfo::addDevice(const std::string& name, 
            return BAD_VALUE;

    }

    if (deviceInfo == nullptr) return BAD_VALUE;

    deviceInfo->notifyDeviceStateChange(mDeviceState);

    deviceInfo->mStatus = initialStatus;

    bool isAPI1Compatible = deviceInfo->isAPI1Compatible();