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

Commit db4d6813 authored by Yin-Chia Yeh's avatar Yin-Chia Yeh Committed by Android (Google) Code Review
Browse files

Merge "Camera: remove BINDERIZED flag"

parents 3b4efe16 469c67b0

camera/device/3.2/default/Android.bp

+1 −25
Original line number Diff line number Diff line 
cc_library_shared {

    name: "android.hardware.camera.device@3.2-impl",

    name: "camera.device@3.2-impl",

    srcs: ["CameraDevice.cpp",

           "CameraDeviceSession.cpp",

           "convert.cpp"],
@@ -20,27 +20,3 @@ cc_library_shared { 
    ],

    export_include_dirs: ["."]

}
 


cc_library_shared {

    name: "android.hardware.camera.device@3.2-impl-binderized",

    srcs: ["CameraDevice.cpp",

           "CameraDeviceSession.cpp",

           "convert.cpp"],

    cppflags: ["-DBINDERIZED"],

    shared_libs: [

        "libhidlbase",

        "libhidltransport",

        "libhwbinder",

        "libutils",

        "libcutils",

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

        "android.hardware.camera.provider@2.4",

        "liblog",

        "libhardware",

        "libcamera_metadata"

    ],

    static_libs: [

        "android.hardware.camera.common@1.0-helper"

    ],

    export_include_dirs: ["."]

}

camera/device/3.2/default/CameraDeviceSession.cpp

+0 −9
Original line number Diff line number Diff line
@@ -118,9 +118,6 @@ public: 
private:

    bool mInitialized;



    // Some existing gralloc drivers do not support retaining more than once,

    // when we are in passthrough mode.

#ifdef BINDERIZED

    bool openGralloc()

    {

        const hw_module_t* module;
@@ -209,12 +206,6 @@ private: 


    // gralloc0

    const gralloc_module_t* mModule;

#else

    bool openGralloc() { return true; }

    void closeGralloc() {}

    buffer_handle_t cloneBuffer(buffer_handle_t handle) { return handle; }

    void releaseBuffer(buffer_handle_t) {}

#endif

};



HandleImporter sHandleImporter;

camera/provider/2.4/default/Android.bp

+2 −3
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ cc_library_shared { 
        "libcutils",

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

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

        "android.hardware.camera.device@3.2-impl",

        "camera.device@3.2-impl",

        "android.hardware.camera.provider@2.4",

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

        "liblog",
@@ -25,7 +25,7 @@ cc_library_shared { 
cc_binary {

    name: "android.hardware.camera.provider@2.4-service",

    relative_install_path: "hw",

    srcs: ["service.cpp", "CameraProvider.cpp"],

    srcs: ["service.cpp"],

    compile_multilib: "32",

    init_rc: ["android.hardware.camera.provider@2.4-service.rc"],

    shared_libs: [
@@ -40,7 +40,6 @@ cc_binary { 
        "android.hardware.camera.provider@2.4",

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

        "libcutils",

        "android.hardware.camera.device@3.2-impl-binderized",

        "libcamera_metadata"

    ],

    static_libs: [

camera/provider/2.4/default/service.cpp

+2 −30
Original line number Diff line number Diff line
@@ -17,41 +17,13 @@ 
#define LOG_TAG "android.hardware.camera.provider@2.4-service"



#include <android/hardware/camera/provider/2.4/ICameraProvider.h>

#include <CameraProvider.h>



#include <hidl/HidlTransportSupport.h>

#include <hidl/LegacySupport.h>

#include <utils/StrongPointer.h>



using android::hardware::configureRpcThreadpool;

using android::hardware::joinRpcThreadpool;

using android::sp;

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

using android::hardware::camera::provider::V2_4::implementation::HIDL_FETCH_ICameraProvider;

using android::hardware::defaultPassthroughServiceImplementation;



int main()

{

    const char instance[] = "legacy/0";



    // TODO(b/34817742): use defaultServicePassthroughImplementation

    // so that the toggle is implemented correctly

    using ::android::hardware::details::blockIfBinderizationDisabled;

    blockIfBinderizationDisabled(ICameraProvider::descriptor, instance);



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



    configureRpcThreadpool(1, true /* callerWillJoin */);

    // TODO (b/34510650): check the passthrough/binderized dev key

    sp<ICameraProvider> service = HIDL_FETCH_ICameraProvider(instance);

    if (service == nullptr) {

        ALOGI("Camera provider getService returned NULL");

        return -1;

    }



    LOG_FATAL_IF(service->isRemote(), "Camera provider service is REMOTE!");



    service->registerAsService(instance);

    joinRpcThreadpool();



    return 0;

    return defaultPassthroughServiceImplementation<ICameraProvider>("legacy/0");

}
 
 No newline at end of file