device.mk

@@ -42,12 +42,6 @@ include device/peter/gsi/quirks/quirks.mk
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.telephony.euicc.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/android.hardware.telephony.euicc.xml
 
-PRODUCT_PACKAGES += \
-    OpenEUICC
-
-# vendor/foss
-PRODUCT_PACKAGES += \
-    UnifiedNlp
 
 # Enable ro.adb.secure on userdebug and user
 ifeq (,$(filter eng,$(TARGET_BUILD_VARIANT)))

init/init_gsi.cpp

@@ -40,6 +40,8 @@ void handle_device_model_props() {
     string brand = base::GetProperty("ro.product.vendor.brand", "");
     string manufacturer = base::GetProperty("ro.product.vendor.manufacturer", "");
     string fingerprint = base::GetProperty("ro.vendor.build.fingerprint", "");
+    string spl = base::GetProperty("ro.vendor.build.security_patch", "");
+    string spl_orig = base::GetProperty("ro.build.version.security_patch", "");
     
     for (const auto& source : RO_PROP_SOURCES) {
         override_ro_prop("ro.product", source, "device", device);
@@ -52,6 +54,8 @@ void handle_device_model_props() {
     override_ro_prop("ro", "", "build.stock_fingerprint", fingerprint);
     override_ro_prop("ro", "", "build.flavor", name + "-user");
     override_ro_prop("ro", "", "build.tags", "release-keys");
+    override_ro_prop("ro", "", "build.version.security_patch", spl);
+    override_ro_prop("ro", "", "build.version.real_security_patch", spl_orig);
 }
 
 int main(int argc, char **argv) {

init/quirks/soc/caf_audio.cpp

@@ -1,7 +1,5 @@
 #include "../../quirks.h"
 
-#include <android-base/properties.h>
-
 #include <filesystem>
 
 using namespace std;
@@ -17,10 +15,6 @@ public:
         if (filesystem::exists("/vendor/etc/a2dp_audio_policy_configuration.xml")) {
             Quirks::OverrideFileReplaceSubstr("/vendor/etc/a2dp_audio_policy_configuration.xml", "bluetooth_qti", "a2dp");
         }
-
-        // Disable A2DP offload on qcom
-        android::base::SetProperty("persist.bluetooth.a2dp_offload.disabled", "true");
-        android::base::SetProperty("persist.bluetooth.bluetooth_audio_hal.disabled", "true");
     }
 };
 

sepolicy/private/qualcomm.te

@@ -1,5 +0,0 @@
-type vendor_qmipriod, domain;
-type vendor_qmipriod_data_file, file_type, data_file_type;
-
-r_dir_file(vendor_qmipriod, vendor_qmipriod_data_file);
-allow vendor_qmipriod vendor_qmipriod_data_file:file w_file_perms;