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

Commit ce9c1a6e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic 'fix_mess' 

* changes:
  Revert "Revert "android.hardware.camera.provider@2.4: set up /dev/vndbinder""
  Revert "Revert "composer: route binder traffic over vndbinder""
parents b26ccb01 ca4c2c22

camera/provider/2.4/default/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ cc_binary { 
    shared_libs: [

        "libhidlbase",

        "libhidltransport",

        "libbinder",

        "liblog",

        "libutils",

        "android.hardware.camera.device@1.0",

camera/provider/2.4/default/service.cpp

+5 −0
Original line number Diff line number Diff line
@@ -19,11 +19,16 @@ 
#include <android/hardware/camera/provider/2.4/ICameraProvider.h>

#include <hidl/LegacySupport.h>



#include <binder/ProcessState.h>



using android::hardware::camera::provider::V2_4::ICameraProvider;

using android::hardware::defaultPassthroughServiceImplementation;



int main()

{

    ALOGI("Camera provider Service is starting.");

    // The camera HAL may communicate to other vendor components via

    // /dev/vndbinder

    android::ProcessState::initWithDriver("/dev/vndbinder");

    return defaultPassthroughServiceImplementation<ICameraProvider>("legacy/0", /*maxThreads*/ 6);

}

graphics/composer/2.1/default/service.cpp

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ using android::hardware::defaultPassthroughServiceImplementation; 


int main() {

    // the conventional HAL might start binder services

    android::ProcessState::initWithDriver("/dev/vndbinder");

    android::ProcessState::self()->setThreadPoolMaxThreadCount(4);

    android::ProcessState::self()->startThreadPool();