mirror of
https://github.com/ponces/treble_aosp.git
synced 2025-04-17 11:45:59 +00:00
55 lines
2.3 KiB
Diff
55 lines
2.3 KiB
Diff
From 4de0edc9a5a68c4529677c56e3b618d3e208819a Mon Sep 17 00:00:00 2001
|
|
From: Pierre-Hugues Husson <phh@phh.me>
|
|
Date: Fri, 29 Nov 2024 20:11:52 -0500
|
|
Subject: [PATCH 24/24] Tell Unihertz/Agold we are not a GSI. Fixes aux cam on
|
|
Jelly Max
|
|
|
|
---
|
|
services/camera/libcameraservice/Android.bp | 1 +
|
|
.../libcameraservice/common/aidl/AidlProviderInfo.cpp | 10 ++++++++++
|
|
2 files changed, 11 insertions(+)
|
|
|
|
diff --git a/services/camera/libcameraservice/Android.bp b/services/camera/libcameraservice/Android.bp
|
|
index ecd54db749..ce9422948a 100644
|
|
--- a/services/camera/libcameraservice/Android.bp
|
|
+++ b/services/camera/libcameraservice/Android.bp
|
|
@@ -115,6 +115,7 @@ cc_defaults {
|
|
"android.hardware.camera.provider@2.6",
|
|
"android.hardware.camera.provider@2.7",
|
|
"android.hardware.camera.provider-V3-ndk",
|
|
+ "vendor.mediatek.hardware.agolddaemon-V1-ndk",
|
|
"vendor.samsung.hardware.camera.provider@3.0",
|
|
"vendor.samsung.hardware.camera.provider@4.0",
|
|
"vendor.samsung.hardware.camera.provider-V1-ndk",
|
|
diff --git a/services/camera/libcameraservice/common/aidl/AidlProviderInfo.cpp b/services/camera/libcameraservice/common/aidl/AidlProviderInfo.cpp
|
|
index 9f8fd37e1d..611920b882 100644
|
|
--- a/services/camera/libcameraservice/common/aidl/AidlProviderInfo.cpp
|
|
+++ b/services/camera/libcameraservice/common/aidl/AidlProviderInfo.cpp
|
|
@@ -35,6 +35,7 @@
|
|
#include <utils/Trace.h>
|
|
|
|
#include <aidl/vendor/samsung/hardware/camera/provider/ISehCameraProvider.h>
|
|
+#include <aidl/vendor/mediatek/hardware/agolddaemon/IAgoldDaemon.h>
|
|
|
|
namespace {
|
|
const bool kEnableLazyHal(property_get_bool("ro.camera.enableLazyHal", false));
|
|
@@ -158,6 +159,15 @@ status_t AidlProviderInfo::initializeAidlProvider(
|
|
__FUNCTION__, mProviderName.c_str(), mDeviceState);
|
|
notifyDeviceStateChange(currentDeviceState);
|
|
|
|
+ if (true) {
|
|
+ auto svc = aidl::vendor::mediatek::hardware::agolddaemon::IAgoldDaemon::fromBinder(
|
|
+ ndk::SpAIBinder(AServiceManager_checkService("vendor.mediatek.hardware.agolddaemon.IAgoldDaemon/default")));
|
|
+ if (svc != nullptr) {
|
|
+ ALOGE("Got agold aidl hal");
|
|
+ svc->setNotGsi("NotGsi");
|
|
+ }
|
|
+ }
|
|
+
|
|
res = setUpVendorTags();
|
|
if (res != OK) {
|
|
ALOGE("%s: Unable to set up vendor tags from provider '%s'",
|
|
--
|
|
2.43.0
|
|
|