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

Commit 73ef524b authored by Ján Sebechlebský's avatar Ján Sebechlebský Committed by Android (Google) Code Review
Browse files

Merge "Move virtual_camera_service_discovery flag to virtual_devices namespace" into main

parents ed205ca7 a79c939c

camera/camera_platform.aconfig

+0 −6
Original line number Diff line number Diff line
@@ -35,9 +35,3 @@ flag { 
     bug: "307409002"

}

flag {

     namespace: "camera_platform"

     name: "virtual_camera_service_discovery"

     description: "Enable discovery of the Virtual Camera HAL without a VINTF entry"

     bug: "305170199"

}

services/camera/libcameraservice/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ cc_defaults { 
        "libstagefright_foundation",

        "libxml2",

        "libyuv",

        "android.companion.virtualdevice.flags-aconfig-cc",

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

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

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

services/camera/libcameraservice/common/CameraProviderManager.cpp

+3 −1
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#include <dlfcn.h>

#include <future>

#include <inttypes.h>

#include <android_companion_virtualdevice_flags.h>

#include <android/binder_manager.h>

#include <android/hidl/manager/1.2/IServiceManager.h>

#include <hidl/ServiceManagement.h>
@@ -59,6 +60,7 @@ using std::literals::chrono_literals::operator""s; 
using hardware::camera2::utils::CameraIdAndSessionConfiguration;



namespace flags = com::android::internal::camera::flags;

namespace vd_flags = android::companion::virtualdevice::flags;



namespace {

const bool kEnableLazyHal(property_get_bool("ro.camera.enableLazyHal", false));
@@ -3162,7 +3164,7 @@ void CameraProviderManager::filterLogicalCameraIdsLocked( 
}



bool CameraProviderManager::isVirtualCameraHalEnabled() {

    return flags::virtual_camera_service_discovery();

    return vd_flags::virtual_camera_service_discovery();

}



} // namespace android

services/camera/libcameraservice/common/aidl/AidlProviderInfo.cpp

+3 −2
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <cutils/properties.h>



#include <aidlcommonsupport/NativeHandle.h>

#include <android_companion_virtualdevice_flags.h>

#include <android/binder_manager.h>

#include <android/hardware/ICameraService.h>

#include <camera_metadata_hidden.h>
@@ -35,9 +36,9 @@ const bool kEnableLazyHal(property_get_bool("ro.camera.enableLazyHal", false)); 


namespace android {



namespace flags = com::android::internal::camera::flags;

namespace SessionConfigurationUtils = ::android::camera3::SessionConfigurationUtils;

namespace flags = com::android::internal::camera::flags;

namespace vd_flags = android::companion::virtualdevice::flags;



using namespace aidl::android::hardware;

using namespace hardware::camera;
@@ -131,7 +132,7 @@ status_t AidlProviderInfo::initializeAidlProvider( 


    mDeathRecipient = ndk::ScopedAIBinder_DeathRecipient(AIBinder_DeathRecipient_new(binderDied));



    if (!flags::virtual_camera_service_discovery() || interface->isRemote()) {

    if (!vd_flags::virtual_camera_service_discovery() || interface->isRemote()) {

        binder_status_t link =

                AIBinder_linkToDeath(interface->asBinder().get(), mDeathRecipient.get(), this);

        if (link != STATUS_OK) {

services/camera/libcameraservice/tests/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ cc_test { 
        "libutils",

        "libjpeg",

        "libexif",

        "android.companion.virtualdevice.flags-aconfig-cc",

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

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

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