diff --git a/patches_treble_td/platform_frameworks_av/0014-Support-Samsung-R-multi-cams.patch b/patches_treble_td/platform_frameworks_av/0014-Support-Samsung-R-multi-cams.patch deleted file mode 100644 index 02dd56a..0000000 --- a/patches_treble_td/platform_frameworks_av/0014-Support-Samsung-R-multi-cams.patch +++ /dev/null @@ -1,67 +0,0 @@ -From ce308a54ba2c124fe2f13b82cb3eec26ccb939a5 Mon Sep 17 00:00:00 2001 -From: Pierre-Hugues Husson -Date: Sat, 13 Mar 2021 14:20:03 -0500 -Subject: [PATCH 14/27] Support Samsung R multi-cams - -Change-Id: If46f385e8dd16185cbf37ab083e6a1242e1d1555 ---- - services/camera/libcameraservice/Android.bp | 1 + - .../libcameraservice/common/hidl/HidlProviderInfo.cpp | 8 +++++++- - 2 files changed, 8 insertions(+), 1 deletion(-) - -diff --git a/services/camera/libcameraservice/Android.bp b/services/camera/libcameraservice/Android.bp -index 7c4e4d9bcd..1faeb60ba7 100644 ---- a/services/camera/libcameraservice/Android.bp -+++ b/services/camera/libcameraservice/Android.bp -@@ -165,6 +165,7 @@ cc_library_shared { - "android.hardware.camera.device@3.7", - "android.hardware.camera.device-V1-ndk", - "vendor.samsung.hardware.camera.provider@3.0", -+ "vendor.samsung.hardware.camera.provider@4.0", - "media_permission-aidl-cpp", - ], - -diff --git a/services/camera/libcameraservice/common/hidl/HidlProviderInfo.cpp b/services/camera/libcameraservice/common/hidl/HidlProviderInfo.cpp -index 1acf9c2990..367ffb8cdc 100644 ---- a/services/camera/libcameraservice/common/hidl/HidlProviderInfo.cpp -+++ b/services/camera/libcameraservice/common/hidl/HidlProviderInfo.cpp -@@ -28,6 +28,7 @@ - - #include - #include -+#include - - namespace { - const bool kEnableLazyHal(property_get_bool("ro.camera.enableLazyHal", false)); -@@ -173,7 +174,9 @@ status_t HidlProviderInfo::initializeHidlProvider( - } - - auto samsungCast = vendor::samsung::hardware::camera::provider::V3_0::ISehCameraProvider::castFrom(interface); -+ auto samsung40Cast = vendor::samsung::hardware::camera::provider::V4_0::ISehCameraProvider::castFrom(interface); - auto samsungProvider = samsungCast.isOk() ? static_cast>(samsungCast) : nullptr; -+ auto samsung40Provider = samsung40Cast.isOk() ? static_cast>(samsung40Cast) : nullptr; - - hardware::Return linked = interface->linkToDeath(this, /*cookie*/ mId); - if (!linked.isOk()) { -@@ -211,6 +214,7 @@ status_t HidlProviderInfo::initializeHidlProvider( - status = idStatus; - if (status == Status::OK) { - for (auto& name : cameraDeviceNames) { -+ ALOGE("Listing camera ID %s", name.c_str()); - uint16_t major, minor; - std::string type, id; - status_t res = parseDeviceName(name, &major, &minor, &type, &id); -@@ -224,7 +228,9 @@ status_t HidlProviderInfo::initializeHidlProvider( - } - } }; - hardware::Return ret; -- if(samsungProvider != nullptr && property_get_bool("persist.sys.phh.samsung.camera_ids", false)) -+ if(samsung40Provider != nullptr && property_get_bool("persist.sys.phh.samsung.camera_ids", false)) -+ ret = samsung40Provider->sehGetCameraIdList(cb); -+ else if(samsungProvider != nullptr && property_get_bool("persist.sys.phh.samsung.camera_ids", false)) - ret = samsungProvider->sehGetCameraIdList(cb); - else - ret = interface->getCameraIdList(cb); --- -2.34.1 -