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

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

Merge "cameraserver: inherit RT priority for AIDL HAL ICameraDeviceCallback... 

Merge "cameraserver: inherit RT priority for AIDL HAL ICameraDeviceCallback calls." into tm-qpr-dev am: e8dec5ff

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



Change-Id: Ibc2f2a402ebb144030376c2f1df4f1ef5fa4b264
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4fc0e856 e8dec5ff

services/camera/libcameraservice/device3/aidl/AidlCamera3Device.cpp

+7 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ 


#include <aidl/android/hardware/camera/device/ICameraInjectionSession.h>

#include <aidlcommonsupport/NativeHandle.h>

#include <android/binder_ibinder_platform.h>

#include <android/hardware/camera2/ICameraDeviceUser.h>



#include "utils/CameraTraces.h"
@@ -669,6 +670,12 @@ status_t AidlCamera3Device::switchToOffline( 
    return p->returnStreamBuffers(buffers);

}



::ndk::SpAIBinder AidlCamera3Device::AidlCameraDeviceCallbacks::createBinder() {

    auto binder = BnCameraDeviceCallback::createBinder();

    AIBinder_setInheritRt(binder.get(), /*inheritRt*/ true);

    return binder;

}



::ndk::ScopedAStatus AidlCamera3Device::returnStreamBuffers(

        const std::vector<camera::device::StreamBuffer>& buffers) {

    ReturnBufferStates states {

services/camera/libcameraservice/device3/aidl/AidlCamera3Device.h

+4 −0
Original line number Diff line number Diff line
@@ -242,6 +242,10 @@ class AidlCamera3Device : 
        ::ndk::ScopedAStatus returnStreamBuffers(

                const std::vector<

                        aidl::android::hardware::camera::device::StreamBuffer>& buffers) override;



        protected:

        ::ndk::SpAIBinder createBinder() override;



        private:

            wp<AidlCamera3Device> mParent = nullptr;

    };

services/camera/libcameraservice/device3/aidl/AidlCamera3OfflineSession.cpp

+7 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
#include <utils/Trace.h>



#include <android/hardware/camera2/ICameraDeviceCallbacks.h>

#include <android/binder_ibinder_platform.h>



#include "device3/aidl/AidlCamera3OfflineSession.h"

#include "device3/Camera3OutputStream.h"
@@ -218,6 +219,12 @@ status_t AidlCamera3OfflineSession::initialize(wp<NotificationListener> listener 
    return p->returnStreamBuffers(buffers);

}



::ndk::SpAIBinder AidlCamera3OfflineSession::AidlCameraDeviceCallbacks::createBinder() {

    auto binder = BnCameraDeviceCallback::createBinder();

    AIBinder_setInheritRt(binder.get(), /*inheritRt*/ true);

    return binder;

}



::ndk::ScopedAStatus AidlCamera3OfflineSession::returnStreamBuffers(

        const std::vector<camera::device::StreamBuffer>& buffers) {

    {

services/camera/libcameraservice/device3/aidl/AidlCamera3OfflineSession.h

+4 −0
Original line number Diff line number Diff line
@@ -97,6 +97,10 @@ class AidlCamera3OfflineSession : 
        ::ndk::ScopedAStatus returnStreamBuffers(

                const std::vector<

                        aidl::android::hardware::camera::device::StreamBuffer>& buffers) override;

        protected:



        ::ndk::SpAIBinder createBinder() override;



        private:

            wp<AidlCamera3OfflineSession> mParent = nullptr;

    };