From 38eec85603ff82330d7b79c0c6caaf2ad0c061c7 Mon Sep 17 00:00:00 2001
From: Wilson Sung <wilsonsung@google.com>
Date: Fri, 15 Sep 2023 02:41:08 +0800
Subject: [PATCH] Modify WifiOverlay to M25

Bug: 298309659
Change-Id: Ie326e1037aa84ac9832bfe87f47a27d7572f6b3b
---
 bluetooth/bt_vendor_overlay_komodo.conf | 19 -------------------
 device-tegu.mk                          |  2 +-
 rro_overlays/WifiOverlay/Android.bp     |  4 ++--
 3 files changed, 3 insertions(+), 22 deletions(-)
 delete mode 100644 bluetooth/bt_vendor_overlay_komodo.conf

diff --git a/bluetooth/bt_vendor_overlay_komodo.conf b/bluetooth/bt_vendor_overlay_komodo.conf
deleted file mode 100644
index 19388fc..0000000
--- a/bluetooth/bt_vendor_overlay_komodo.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-# This is BTBCM HAL overlay configuration file.
-
-# Uart port name
-UartPort = /dev/ttySAC18
-
-# Userial type
-# UserialType = 2
-
-# Sar backOff high resolution support
-SarBackOffHighResolution = true
-
-# Update BQR Event Mask property value
-BqrEventMaskValueUpdate = 262238
-
-BtA2dpOffloadCap = sbc-aac-aptx-aptxhd-ldac-opus
-
-BtOpusEnabled = true
-
-AccelBtDisable = false
diff --git a/device-tegu.mk b/device-tegu.mk
index 056a6a9..eb883fc 100644
--- a/device-tegu.mk
+++ b/device-tegu.mk
@@ -196,7 +196,7 @@ PRODUCT_SOONG_NAMESPACES += \
 
 # WiFi Overlay
 PRODUCT_PACKAGES += \
-    WifiOverlay2024
+    WifiOverlay2024_M25
 
 # Trusty liboemcrypto.so
 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/tegu/prebuilts
diff --git a/rro_overlays/WifiOverlay/Android.bp b/rro_overlays/WifiOverlay/Android.bp
index 79a8d9c..18f937e 100644
--- a/rro_overlays/WifiOverlay/Android.bp
+++ b/rro_overlays/WifiOverlay/Android.bp
@@ -10,8 +10,8 @@ package {
 }
 
 runtime_resource_overlay {
-    name: "WifiOverlay2024",
-    theme: "WifiOverlay2024",
+    name: "WifiOverlay2024_M25",
+    theme: "WifiOverlay2024_M25",
     certificate: "platform",
     sdk_version: "current",
     product_specific: true