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

Commit 297e672d authored by Kwangkyu Park's avatar Kwangkyu Park Committed by Automerger Merge Worker
Browse files

Camera: Prevent simultenous HAL initialization am: b1aaf9a7 am: 72f37187 

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



Change-Id: I2f738be68b532fd9fc69be3f76752f68646c3555
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 47c01172 72f37187

services/camera/libcameraservice/CameraService.cpp

+3 −0
Original line number Diff line number Diff line
@@ -2117,6 +2117,9 @@ Status CameraService::connectHelper(const sp<CALLBACK>& cameraCb, const std::str 
        if (err != OK) {

            ALOGE("%s: Could not initialize client from HAL.", __FUNCTION__);

            // Errors could be from the HAL module open call or from AppOpsManager

            mServiceLock.unlock();

            client->disconnect();

            mServiceLock.lock();

            switch(err) {

                case BAD_VALUE:

                    return STATUS_ERROR_FMT(ERROR_ILLEGAL_ARGUMENT,