From ceedb72c3332a0923528f6c34d3625ae537245c7 Mon Sep 17 00:00:00 2001 From: Peter Cai Date: Wed, 1 Jun 2022 23:01:17 -0400 Subject: [PATCH 1/5] init_gsi: Disable A2DP offload on qcom --- init/quirks/soc/caf_audio.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/init/quirks/soc/caf_audio.cpp b/init/quirks/soc/caf_audio.cpp index 3f95130..89a31ae 100644 --- a/init/quirks/soc/caf_audio.cpp +++ b/init/quirks/soc/caf_audio.cpp @@ -1,5 +1,7 @@ #include "../../quirks.h" +#include + #include using namespace std; @@ -15,6 +17,10 @@ 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"); } }; From 1ea8d329863595f145fdb47d20594d9f0d960bfc Mon Sep 17 00:00:00 2001 From: Peter Cai Date: Thu, 2 Jun 2022 22:59:49 -0400 Subject: [PATCH 2/5] device.mk: Include our UnifiedNlp v2 app This should be added as a prebuilt in vendor/foss. --- device.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/device.mk b/device.mk index 5a70383..c2a84a0 100644 --- a/device.mk +++ b/device.mk @@ -42,6 +42,9 @@ 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 +# vendor/foss +PRODUCT_PACKAGES += \ + UnifiedNlp # Enable ro.adb.secure on userdebug and user ifeq (,$(filter eng,$(TARGET_BUILD_VARIANT))) From f7df65f03b01999c7d0ab0ae0f231392714a46d0 Mon Sep 17 00:00:00 2001 From: Peter Cai Date: Sat, 4 Jun 2022 09:34:39 -0400 Subject: [PATCH 3/5] sepolicy: Address qmipriod denials on Xperia 5 II --- sepolicy/private/qualcomm.te | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 sepolicy/private/qualcomm.te diff --git a/sepolicy/private/qualcomm.te b/sepolicy/private/qualcomm.te new file mode 100644 index 0000000..9ccb730 --- /dev/null +++ b/sepolicy/private/qualcomm.te @@ -0,0 +1,5 @@ +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; From 216e24536a8e2e96950351b016230601abf9334b Mon Sep 17 00:00:00 2001 From: Peter Cai Date: Mon, 1 Aug 2022 15:45:10 -0400 Subject: [PATCH 4/5] build OpenEUICC package --- device.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/device.mk b/device.mk index c2a84a0..6296c8d 100644 --- a/device.mk +++ b/device.mk @@ -42,6 +42,9 @@ 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 From 0ce7d0d07ac169f24b1a7db6909425111180a385 Mon Sep 17 00:00:00 2001 From: Peter Cai Date: Wed, 17 Aug 2022 13:55:16 -0400 Subject: [PATCH 5/5] init_gsi: Stop spoofing the SPL property This is the AOSP branch, and we no longer really want to do the spoofing for SN right now. We don't have the framework-side SPL spoofing anyway. --- init/init_gsi.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/init/init_gsi.cpp b/init/init_gsi.cpp index c910fb7..f566245 100644 --- a/init/init_gsi.cpp +++ b/init/init_gsi.cpp @@ -40,8 +40,6 @@ 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); @@ -54,8 +52,6 @@ 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) {