From 40dcd72a81e9eaca3b52ec0273fefcb45211ce60 Mon Sep 17 00:00:00 2001
From: Benson Li <bensonli@google.com>
Date: Tue, 16 Apr 2024 05:51:51 +0000
Subject: [PATCH 1/2] Add system property for concurrent encryption on LE and
 BR/EDR

Bug: 330704060
Change-Id: Iec3a8395031a4d837f11a960216a6e76aa339c7a
Test: make
---
 device-akita.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/device-akita.mk b/device-akita.mk
index f3de9e5..01b0001 100644
--- a/device-akita.mk
+++ b/device-akita.mk
@@ -238,6 +238,10 @@ PRODUCT_PRODUCT_PROPERTIES += \
 PRODUCT_PRODUCT_PROPERTIES += \
     persist.bluetooth.leaudio.allow_list=SM-R510
 
+# Support LE & Classic concurrent encryption (b/330704060)
+PRODUCT_PRODUCT_PROPERTIES += \
+    bluetooth.ble.allow_enc_with_bredr=true
+
 # Enable one-handed mode
 PRODUCT_PRODUCT_PROPERTIES += \
     ro.support_one_handed_mode=true

From 3d903d28adc990db52d25b97bfa9e6dbac02093f Mon Sep 17 00:00:00 2001
From: Nelson Li <nelsonli@google.com>
Date: Fri, 26 Apr 2024 06:36:07 +0000
Subject: [PATCH 2/2] Convert p23_common/preloaded_nanoapps.json's .mk file to
 Android.bp.

p23_common includes 4 devices: `ripcurrent`, `shiba`, `husky`, and
`akita`.

Since `preloaded_nanoapps.json` has different configurations for
`factory` products and `non-factory` products, `soong_namespace {}`
needs to be added to the converted Android.bp file to avoid misuse.

Additionally, due to ag/27008138, ag/27046793, ag/27008143, and
ag/27056982, a common inheritance layer has been added to all
`non-factory` products. Therefore, setting different
`PRODUCT_SOONG_NAMESPACES` in the corresponding `<DEVICE>_generic.mk`
and `factory_<DEVICE>.mk` files will allow factory products and
non-factory products to use different preloaded_nanoapps.json.

Bug: 332219400
Test: 1. lunch <device_name>-trunk_staging-userdebug && \
         m -j preloaded_nanoapps.json
      2. Check ./out/target/product/<device_name>/.../preloaded_nanoapps.json
         It should be the <device_name> version.
      3. lunch factory_<device_name>-trunk_staging-userdebug && \
         m -j preloaded_nanoapps.json
      4. Check ./out/target/product/<device_name>/.../preloaded_nanoapps.json
         It should be the factory version.
Change-Id: Ib33c71773617f7a20b3af982f6140f8f8da0ced4
---
 akita_generic.mk | 3 +++
 factory_akita.mk | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/akita_generic.mk b/akita_generic.mk
index 76f32fc..bb260cd 100644
--- a/akita_generic.mk
+++ b/akita_generic.mk
@@ -15,3 +15,6 @@
 #
 
 $(call inherit-product, device/google/akita/device-akita.mk)
+
+# preloaded_nanoapps.json
+PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/p23_common
diff --git a/factory_akita.mk b/factory_akita.mk
index b834d1e..aae1617 100644
--- a/factory_akita.mk
+++ b/factory_akita.mk
@@ -32,3 +32,6 @@ PRODUCT_PROPERTY_OVERRIDES += \
 
 # Factory binaries of camera
 PRODUCT_PACKAGES += fatp_ak3_wide_hat_tool
+
+# preloaded_nanoapps.json
+PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/factory