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

Commit 262bc35d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Camera: Avoid possible instability when adding new devices" into... 

Merge "Camera: Avoid possible instability when adding new devices" into sc-v2-dev am: fb5539fa am: 92ac88f9

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/16120139

Change-Id: I04927a5443c563664c00631fb75e414a38107a72
parents 2e238bf2 92ac88f9

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();