platform_frameworks_av.patch

From 0fff7ea6bfcb642dcdc1a3a37204d5eed2e75763 Mon Sep 17 00:00:00 2001
From: Daniel Zhang <danielzhang130@gmail.com>
Date: Sat, 11 Jan 2025 21:18:00 -0500
Subject: [PATCH] Revert "Tell Unihertz/Agold we are not a GSI. Fixes aux cam
 on Jelly Max"

This reverts commit f18721f913af6fa7986819b90f451c99110a1a84.
---
 services/camera/libcameraservice/Android.bp            |  1 -
 .../libcameraservice/common/aidl/AidlProviderInfo.cpp  | 10 ----------
 2 files changed, 11 deletions(-)

diff --git a/services/camera/libcameraservice/Android.bp b/services/camera/libcameraservice/Android.bp
index 0fc7485..b2807ec 100644
--- a/services/camera/libcameraservice/Android.bp
+++ b/services/camera/libcameraservice/Android.bp
@@ -113,7 +113,6 @@ 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 d6ab950..a640286 100644
--- a/services/camera/libcameraservice/common/aidl/AidlProviderInfo.cpp
+++ b/services/camera/libcameraservice/common/aidl/AidlProviderInfo.cpp
@@ -34,7 +34,6 @@
 #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,15 +157,6 @@ 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.34.1