Snap for 9366140 from 873d840ad99dbce4c8550a929af8eefc542bdc36 to tm-d4-releaseandroid-13.0.0_r48android-13.0.0_r47android-13.0.0_r46android13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-release

Change-Id: I43d1791f137dd0c4a1c3d897990f57fbf11fef28

8 files changed, 31 insertions, 21 deletions

diff --git a/emulator/aosp_car_emulator.mk b/emulator/aosp_car_emulator.mk
index 07f4959..aedcdc7 100644
--- a/emulator/aosp_car_emulator.mk
+++ b/emulator/aosp_car_emulator.mk
@@ -28,6 +28,8 @@ $(call inherit-product, device/generic/car/emulator/rotary/car_rotary.mk)
 # Enables USB related passthrough
 $(call inherit-product, device/generic/car/emulator/usbpt/car_usbpt.mk)
 
+TARGET_PRODUCT_PROP := device/generic/car/emulator/usbpt/bluetooth/bluetooth.prop
+
 ifeq (true,$(BUILD_EMULATOR_CLUSTER_DISPLAY))
 PRODUCT_COPY_FILES += \
     device/generic/car/emulator/cluster/display_settings.xml:system/etc/display_settings.xml \
diff --git a/emulator/usbpt/bluetooth/bluetooth.prop b/emulator/usbpt/bluetooth/bluetooth.prop
new file mode 100644
index 0000000..fdd00c0
--- /dev/null
+++ b/emulator/usbpt/bluetooth/bluetooth.prop
@@ -0,0 +1,20 @@
+# The default Bluetooth Class of Device
+# Service Field: 0x26 -> 38
+#     - Bit 17: Networking
+#     - Bit 18: Rendering
+#     - Bit 21: Audio
+# Major Class: 0x04 -> 4 (Audio / Video)
+# Minor Class: 0x08 -> 8 (Car Audio)
+bluetooth.device.class_of_device=38,4,8
+bluetooth.device.default_name=gCar Emulator
+
+# The Bluetooth profiles that cars expect to have enabled. All other profiles
+# are disabled by default.
+bluetooth.profile.a2dp.sink.enabled=true
+bluetooth.profile.avrcp.controller.enabled=true
+bluetooth.profile.gatt.enabled=true
+bluetooth.profile.hfp.hf.enabled=true
+bluetooth.profile.map.client.enabled=true
+bluetooth.profile.pan.nap.enabled=true
+bluetooth.profile.pan.panu.enabled=true
+bluetooth.profile.pbap.client.enabled=true
diff --git a/emulator/usbpt/bluetooth/btusb/BoardConfig.mk b/emulator/usbpt/bluetooth/btusb/BoardConfig.mk
index 7011ee7..c37e7d0 100644
--- a/emulator/usbpt/bluetooth/btusb/BoardConfig.mk
+++ b/emulator/usbpt/bluetooth/btusb/BoardConfig.mk
@@ -13,12 +13,7 @@
 # limitations under the License.
 #
 
-BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/generic/car/emulator/usbpt/bluetooth/btusb/hal
+TARGET_KERNEL_USE ?= 5.15
 
-TARGET_KERNEL_USE ?= 5.10
-
-ifeq ($(TARGET_ARCH),x86_64)
-BOARD_VENDOR_KERNEL_MODULES += kernel/prebuilts/common-modules/virtual-device/$(TARGET_KERNEL_USE)/x86-64/btusb.ko
-else ifeq ($(TARGET_ARCH),arm64)
-BOARD_VENDOR_KERNEL_MODULES += kernel/prebuilts/common-modules/virtual-device/$(TARGET_KERNEL_USE)/arm64/btusb.ko
-endif
+BOARD_VENDOR_KERNEL_MODULES += \
+	$(KERNEL_MODULES_PATH)/btusb.ko
diff --git a/emulator/usbpt/bluetooth/btusb/hal/bdroid_buildcfg.h b/emulator/usbpt/bluetooth/btusb/hal/bdroid_buildcfg.h
deleted file mode 100644
index 132b683..0000000
--- a/emulator/usbpt/bluetooth/btusb/hal/bdroid_buildcfg.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef _BDROID_BUILDCFG_H
-#define _BDROID_BUILDCFG_H
-#define BTM_DEF_LOCAL_NAME "gCar Emulator"
-#define BTA_AV_SINK_INCLUDED TRUE
-/* Handsfree device */
-#define BTA_DM_COD {0x26, 0x04, 0x08}
-/* Workaround for error at connection. */
-#define BT_CLEAN_TURN_ON_DISABLED 1
-#endif
diff --git a/emulator/usbpt/wifi/BoardConfig.mk b/emulator/usbpt/wifi/BoardConfig.mk
index ba678a3..ae96593 100644
--- a/emulator/usbpt/wifi/BoardConfig.mk
+++ b/emulator/usbpt/wifi/BoardConfig.mk
@@ -23,4 +23,4 @@ BOARD_VENDOR_KERNEL_MODULES += \
 	$(KERNEL_MODULES_PATH)/mt76x02-usb.ko \
 	$(KERNEL_MODULES_PATH)/mt76x02-lib.ko \
 	$(KERNEL_MODULES_PATH)/mt76-usb.ko \
-	$(KERNEL_MODULES_PATH)/mt76.ko
\ No newline at end of file
+	$(KERNEL_MODULES_PATH)/mt76.ko
diff --git a/emulator/usbpt/wifi/init.wifiusb.rc b/emulator/usbpt/wifi/init.wifiusb.rc
index 860a9b5..5b09e12 100644
--- a/emulator/usbpt/wifi/init.wifiusb.rc
+++ b/emulator/usbpt/wifi/init.wifiusb.rc
@@ -16,4 +16,4 @@ on early-init
     write /sys/module/firmware_class/parameters/path /vendor/firmware/
 
 on boot
-    exec u:r:vendor_modprobe:s0 -- /vendor/bin/modprobe -a -d /vendor/lib/modules mt76x2u.ko mt76x2_common.ko mt76x0u.ko mt76x02_usb.ko mt76x0_common.ko mt76x02_lib.ko mt76_usb.ko mt76.ko
+    exec u:r:vendor_modprobe:s0 -- /vendor/bin/modprobe -a -d /vendor/lib/modules mt76.ko mt76-usb.ko mt76x02-lib.ko mt76x02-usb.ko mt76x0-common.ko mt76x0u.ko mt76x2-common.ko mt76x2u.ko
diff --git a/emulator_car64_arm64/BoardConfig.mk b/emulator_car64_arm64/BoardConfig.mk
index 6c856b0..607c24f 100644
--- a/emulator_car64_arm64/BoardConfig.mk
+++ b/emulator_car64_arm64/BoardConfig.mk
@@ -13,6 +13,8 @@
 # limitations under the License.
 #
 
+BOARD_DO_NOT_STRIP_VENDOR_MODULES := true
+
 # Use emulator64_arm64 BoardConfig as base
 include device/generic/goldfish/emulator64_arm64/BoardConfig.mk
 include device/generic/car/emulator/usbpt/BoardConfig.mk
@@ -21,4 +23,3 @@ include device/generic/car/emulator/usbpt/BoardConfig.mk
 BOARD_SUPER_PARTITION_SIZE := 5856296960
 
 BOARD_EMULATOR_DYNAMIC_PARTITIONS_SIZE = 3489660928
-
diff --git a/emulator_car64_x86_64/BoardConfig.mk b/emulator_car64_x86_64/BoardConfig.mk
index bfd00ce..01b503e 100644
--- a/emulator_car64_x86_64/BoardConfig.mk
+++ b/emulator_car64_x86_64/BoardConfig.mk
@@ -13,6 +13,8 @@
 # limitations under the License.
 #
 
+BOARD_DO_NOT_STRIP_VENDOR_MODULES := true
+
 # Use emulator64_x86_64_arm64 BoardConfig as base
 include device/generic/goldfish/emulator64_x86_64/BoardConfig.mk
 include device/generic/car/emulator/usbpt/BoardConfig.mk
@@ -21,4 +23,3 @@ include device/generic/car/emulator/usbpt/BoardConfig.mk
 BOARD_SUPER_PARTITION_SIZE := 5856296960
 
 BOARD_EMULATOR_DYNAMIC_PARTITIONS_SIZE = 3489660928
-