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

Commit 776712c8 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

release-request-53526352-7b51-4ab1-a661-632ffc55dd7c-for-git_oc-mr1-release-43... 

release-request-53526352-7b51-4ab1-a661-632ffc55dd7c-for-git_oc-mr1-release-4371241 snap-temp-L10900000107789672

Change-Id: I10139bbfb947d2c4b3b88e557713e9f02693eb17
parents 07a3a6a7 73d0374f

services/audioflinger/Threads.cpp

+2 −4
Original line number Diff line number Diff line
@@ -8148,10 +8148,8 @@ void AudioFlinger::MmapThread::threadLoop_standby() 


void AudioFlinger::MmapThread::threadLoop_exit()

{

    sp<MmapStreamCallback> callback = mCallback.promote();

    if (callback != 0) {

        callback->onTearDown();

    }

    // Do not call callback->onTearDown() because it is redundant for thread exit

    // and because it can cause a recursive mutex lock on stop().

}



status_t AudioFlinger::MmapThread::setSyncEvent(const sp<SyncEvent>& event __unused)

services/camera/libcameraservice/common/CameraProviderManager.cpp

+6 −1
Original line number Diff line number Diff line
@@ -202,12 +202,17 @@ bool CameraProviderManager::supportSetTorchMode(const std::string &id) { 
    for (auto& provider : mProviders) {

        auto deviceInfo = findDeviceInfoLocked(id);

        if (deviceInfo != nullptr) {

            provider->mInterface->isSetTorchModeSupported(

            auto ret = provider->mInterface->isSetTorchModeSupported(

                [&support](auto status, bool supported) {

                    if (status == Status::OK) {

                        support = supported;

                    }

                });

            if (!ret.isOk()) {

                ALOGE("%s: Transaction error checking torch mode support '%s': %s",

                        __FUNCTION__, provider->mProviderName.c_str(), ret.description().c_str());

            }

            break;

        }

    }

    return support;