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

Commit ffff5ff5 authored by Jayant Chowdhary's avatar Jayant Chowdhary Committed by Automerger Merge Worker
Browse files

Merge "Camera: fix an issue regarding ndk/vndk availability callback" into... 

Merge "Camera: fix an issue regarding ndk/vndk availability callback" into main am: 6b443cf3 am: ec49efbe

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



Change-Id: I9a368e9278abb12476836ea98211e516f128c785
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents de2d3130 ec49efbe

camera/ndk/impl/ACameraManager.cpp

+1 −0
Original line number Diff line number Diff line
@@ -255,6 +255,7 @@ void CameraManagerGlobal::drainPendingCallbacksLocked() { 
template<class T>

void CameraManagerGlobal::registerAvailCallback(const T *callback) {

    Mutex::Autolock _l(mLock);

    getCameraServiceLocked();

    Callback cb(callback);

    auto pair = mCallbacks.insert(cb);

    // Send initial callbacks if callback is newly registered

camera/ndk/ndk_vendor/impl/ACameraManager.cpp

+1 −0
Original line number Diff line number Diff line
@@ -396,6 +396,7 @@ void CameraManagerGlobal::drainPendingCallbacksLocked() { 


template <class T>

void CameraManagerGlobal::registerAvailCallback(const T *callback) {

    getCameraService();

    Mutex::Autolock _l(mLock);

    Callback cb(callback);

    auto res = mCallbacks.insert(cb);

services/camera/libcameraservice/CameraService.cpp

+1 −2
Original line number Diff line number Diff line
@@ -5638,8 +5638,7 @@ void CameraService::updateStatus(StatusInternal status, const std::string& camer 
            for (auto& listener : mListenerList) {

                bool isVendorListener = listener->isVendorListener();

                if (shouldSkipStatusUpdates(deviceKind, isVendorListener,

                        listener->getListenerPid(), listener->getListenerUid()) ||

                        isVendorListener) {

                        listener->getListenerPid(), listener->getListenerUid())) {

                    ALOGV("Skipping discovery callback for system-only camera device %s",

                            cameraId.c_str());

                    continue;