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

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

Merge "Use build flag to safeguard virtual_camera service access" into main

parents 7fcb039d 2f66b5e3

services/camera/libcameraservice/Android.bp

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

        "libdynamic_depth",

        "libprocessinfoservice_aidl",

        "libvirtualdevicebuildflags",

        "media_permission-aidl-cpp",

    ],

}

services/camera/libcameraservice/common/CameraProviderManager.cpp

+3 −1
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
#include <future>

#include <inttypes.h>

#include <android_companion_virtualdevice_flags.h>

#include <android_companion_virtualdevice_build_flags.h>

#include <android/binder_manager.h>

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

#include <hidl/ServiceManagement.h>
@@ -3266,7 +3267,8 @@ void CameraProviderManager::filterLogicalCameraIdsLocked( 
}



bool CameraProviderManager::isVirtualCameraHalEnabled() {

    return vd_flags::virtual_camera_service_discovery();

    return vd_flags::virtual_camera_service_discovery() &&

           vd_flags::virtual_camera_service_build_flag();

}



} // namespace android