[TMP] Revert "Aerodactyl: Switch back to the prebuilt wifi HAL"

This reverts commit 633085b5c5.

Aerodactyl-vendor.mk

@@ -8,7 +8,6 @@ PRODUCT_SOONG_NAMESPACES += \
 PRODUCT_COPY_FILES += \
     vendor/nothing/Aerodactyl/proprietary/product/etc/sysconfig/felica-allowlist.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/sysconfig/felica-allowlist.xml \
     vendor/nothing/Aerodactyl/proprietary/system/etc/public.libraries-mtk.txt:$(TARGET_COPY_OUT_SYSTEM)/etc/public.libraries-mtk.txt \
-    vendor/nothing/Aerodactyl/proprietary/system/etc/sysconfig/preinstalled-packages-audioeffect.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/sysconfig/preinstalled-packages-audioeffect.xml \
     vendor/nothing/Aerodactyl/proprietary/system_ext/etc/init/init.vtservice.rc:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/init/init.vtservice.rc \
     vendor/nothing/Aerodactyl/proprietary/system_ext/etc/permissions/com.android.hotwordenrollment.common.util.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/com.android.hotwordenrollment.common.util.xml \
     vendor/nothing/Aerodactyl/proprietary/system_ext/etc/sysconfig/com.mediatek.ims.config.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/sysconfig/com.mediatek.ims.config.xml \
@@ -1117,7 +1116,6 @@ PRODUCT_PACKAGES += \
     vendor.mediatek.hardware.apuware.xrp@2.0 \
     vendor.mediatek.hardware.videotelephony-V1-ndk \
     vendor.mediatek.hardware.videotelephony@1.0 \
-    NothingAudioEffectService \
     MobileFeliCaClient \
     MobileFeliCaMenuMainApp \
     MobileFeliCaSettingApp \
@@ -1127,13 +1125,13 @@ PRODUCT_PACKAGES += \
     ImsService \
     MtkGbaService \
     MtkTelephonyAssist \
-    com.android.hotwordenrollment.common.util \
     mediatek-ims-base \
     mediatek-ims-common \
-    mediatek-ims-extension-plugin \
     mediatek-telecom-common \
     mediatek-telephony-base \
     mediatek-telephony-common \
+    com.android.hotwordenrollment.common.util \
+    mediatek-ims-extension-plugin \
     android.hardware.neuralnetworks-shim-service-mtk.xml \
     android.hardware.security.keymint-service.trustonic.xml \
     android.hardware.security.secureclock-service.trustonic.xml \
@@ -1575,3 +1573,10 @@ PRODUCT_PACKAGES += \
     vendor_lib64_s5kjn1_mipi_raw_tuning_so \
     vendor_lib64_s5kjn1front_mipi_raw_IdxMgr_so \
     vendor_lib64_s5kjn1front_mipi_raw_tuning_so
+
+PRODUCT_BOOT_JARS += \
+    mediatek-ims-base \
+    mediatek-ims-common \
+    mediatek-telecom-common \
+    mediatek-telephony-base \
+    mediatek-telephony-common

Android.bp

@@ -23478,17 +23478,6 @@ cc_prebuilt_library_shared {
     system_ext_specific: true,
 }
 
-android_app_import {
-    name: "NothingAudioEffectService",
-    owner: "nothing",
-    apk: "proprietary/system/priv-app/NothingAudioEffectService/NothingAudioEffectService.apk",
-    certificate: "platform",
-    dex_preopt: {
-        enabled: false,
-    },
-    privileged: true,
-}
-
 android_app_import {
     name: "MobileFeliCaClient",
     owner: "nothing",
@@ -23597,6 +23586,46 @@ android_app_import {
     system_ext_specific: true,
 }
 
+dex_import {
+    name: "mediatek-ims-base",
+    owner: "nothing",
+    jars: [
+        "proprietary/system/framework/mediatek-ims-base.jar",
+    ],
+}
+
+dex_import {
+    name: "mediatek-ims-common",
+    owner: "nothing",
+    jars: [
+        "proprietary/system/framework/mediatek-ims-common.jar",
+    ],
+}
+
+dex_import {
+    name: "mediatek-telecom-common",
+    owner: "nothing",
+    jars: [
+        "proprietary/system/framework/mediatek-telecom-common.jar",
+    ],
+}
+
+dex_import {
+    name: "mediatek-telephony-base",
+    owner: "nothing",
+    jars: [
+        "proprietary/system/framework/mediatek-telephony-base.jar",
+    ],
+}
+
+dex_import {
+    name: "mediatek-telephony-common",
+    owner: "nothing",
+    jars: [
+        "proprietary/system/framework/mediatek-telephony-common.jar",
+    ],
+}
+
 dex_import {
     name: "com.android.hotwordenrollment.common.util",
     owner: "nothing",
@@ -23606,24 +23635,6 @@ dex_import {
     system_ext_specific: true,
 }
 
-dex_import {
-    name: "mediatek-ims-base",
-    owner: "nothing",
-    jars: [
-        "proprietary/system_ext/framework/mediatek-ims-base.jar",
-    ],
-    system_ext_specific: true,
-}
-
-dex_import {
-    name: "mediatek-ims-common",
-    owner: "nothing",
-    jars: [
-        "proprietary/system_ext/framework/mediatek-ims-common.jar",
-    ],
-    system_ext_specific: true,
-}
-
 dex_import {
     name: "mediatek-ims-extension-plugin",
     owner: "nothing",
@@ -23633,33 +23644,6 @@ dex_import {
     system_ext_specific: true,
 }
 
-dex_import {
-    name: "mediatek-telecom-common",
-    owner: "nothing",
-    jars: [
-        "proprietary/system_ext/framework/mediatek-telecom-common.jar",
-    ],
-    system_ext_specific: true,
-}
-
-dex_import {
-    name: "mediatek-telephony-base",
-    owner: "nothing",
-    jars: [
-        "proprietary/system_ext/framework/mediatek-telephony-base.jar",
-    ],
-    system_ext_specific: true,
-}
-
-dex_import {
-    name: "mediatek-telephony-common",
-    owner: "nothing",
-    jars: [
-        "proprietary/system_ext/framework/mediatek-telephony-common.jar",
-    ],
-    system_ext_specific: true,
-}
-
 prebuilt_etc_xml {
     name: "android.hardware.neuralnetworks-shim-service-mtk.xml",
     owner: "nothing",

proprietary/system/etc/sysconfig/preinstalled-packages-audioeffect.xml

@@ -1,20 +0,0 @@
-<!--
-  ~ Copyright (C) 2021 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-<config>
-    <install-in-user-type package="com.nothing.audioeffect">
-        <install-in user-type="SYSTEM"/>
-    </install-in-user-type>
-</config>

proprietary/vendor/etc/displayconfig/display_id_4627039422300187648.xml

@@ -50,7 +50,7 @@
         </point>
     </screenBrightnessMap>
     <highBrightnessMode enabled="true">
-        <transitionPoint>0.6</transitionPoint>
+        <transitionPoint>0.9221</transitionPoint>
         <minimumLux>7500.0</minimumLux>
         <timing>
             <!-- allow for 5 minutes out of every 30 minutes -->