From dc4f4a2a9630f7042220f4d0d20430a039f62f13 Mon Sep 17 00:00:00 2001 From: Talmid of Levi Date: Fri, 15 Dec 2023 16:18:06 -0500 Subject: [PATCH] Delete patches_treble_td/platform_frameworks_av/0023-Support-variable-flash-strength-on-samsung-hal-4.0.patch --- ...le-flash-strength-on-samsung-hal-4.0.patch | 52 ------------------- 1 file changed, 52 deletions(-) delete mode 100644 patches_treble_td/platform_frameworks_av/0023-Support-variable-flash-strength-on-samsung-hal-4.0.patch diff --git a/patches_treble_td/platform_frameworks_av/0023-Support-variable-flash-strength-on-samsung-hal-4.0.patch b/patches_treble_td/platform_frameworks_av/0023-Support-variable-flash-strength-on-samsung-hal-4.0.patch deleted file mode 100644 index 0ad3e93..0000000 --- a/patches_treble_td/platform_frameworks_av/0023-Support-variable-flash-strength-on-samsung-hal-4.0.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 7ba94ce583e1ab8b6bf86f798865082bd1bd86e9 Mon Sep 17 00:00:00 2001 -From: Pierre-Hugues Husson -Date: Mon, 2 May 2022 17:37:09 -0400 -Subject: [PATCH 23/27] Support variable flash strength on samsung hal 4.0 - ---- - services/camera/libcameraservice/Android.bp | 1 + - .../libcameraservice/common/hidl/HidlProviderInfo.cpp | 6 ++++++ - 2 files changed, 7 insertions(+) - -diff --git a/services/camera/libcameraservice/Android.bp b/services/camera/libcameraservice/Android.bp -index 8c588065cf..769862aaa2 100644 ---- a/services/camera/libcameraservice/Android.bp -+++ b/services/camera/libcameraservice/Android.bp -@@ -167,6 +167,7 @@ cc_library_shared { - "vendor.samsung.hardware.camera.provider@3.0", - "vendor.samsung.hardware.camera.provider@4.0", - "vendor.samsung.hardware.camera.device@5.0", -+ "vendor.samsung.hardware.camera.device@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 362945a1ea..62c57cd4f7 100644 ---- a/services/camera/libcameraservice/common/hidl/HidlProviderInfo.cpp -+++ b/services/camera/libcameraservice/common/hidl/HidlProviderInfo.cpp -@@ -30,6 +30,7 @@ - #include - #include - #include -+#include - - namespace { - const bool kEnableLazyHal(property_get_bool("ro.camera.enableLazyHal", false)); -@@ -787,9 +788,14 @@ status_t HidlProviderInfo::HidlDeviceInfo3::setTorchMode(bool enabled) { - auto sehCast = vendor::samsung::hardware::camera::device::V5_0::ISehCameraDevice::castFrom(interface); - android::sp seh = sehCast; - -+ auto sehCast2 = vendor::samsung::hardware::camera::device::V4_0::ISehCameraDevice::castFrom(interface); -+ android::sp seh2 = sehCast2; -+ - Status s; - if(seh != nullptr) { - s = seh->sehSetTorchModeStrength(enabled ? TorchMode::ON : TorchMode::OFF, flashStrength); -+ } else if(seh2 != nullptr) { -+ s = seh2->sehSetTorchModeStrength(enabled ? TorchMode::ON : TorchMode::OFF, flashStrength); - } else { - s = interface->setTorchMode(enabled ? TorchMode::ON : TorchMode::OFF); - } --- -2.34.1 -