From fcfa9d0ee2601ad25eea6375d3300a08803aca48 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Sat, 22 Jan 2022 01:13:28 +0000
Subject: [PATCH] Changes for January 2022

---
 ...es-we-need-to-tell-Audio-HAL-if-we-r.patch | 54 -------------------
 ...01-Report-SCO-sample-rate-by-default.patch | 24 +++++++++
 2 files changed, 24 insertions(+), 54 deletions(-)
 delete mode 100644 patches_treble_phh/platform_packages_apps_Bluetooth/0001-On-Samsung-devices-we-need-to-tell-Audio-HAL-if-we-r.patch
 create mode 100644 patches_treble_phh/platform_packages_apps_Bluetooth/0001-Report-SCO-sample-rate-by-default.patch

diff --git a/patches_treble_phh/platform_packages_apps_Bluetooth/0001-On-Samsung-devices-we-need-to-tell-Audio-HAL-if-we-r.patch b/patches_treble_phh/platform_packages_apps_Bluetooth/0001-On-Samsung-devices-we-need-to-tell-Audio-HAL-if-we-r.patch
deleted file mode 100644
index 74cd386..0000000
--- a/patches_treble_phh/platform_packages_apps_Bluetooth/0001-On-Samsung-devices-we-need-to-tell-Audio-HAL-if-we-r.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From bf7c5e06d196b9863c1cc61fa073442c353f5075 Mon Sep 17 00:00:00 2001
-From: Andreas Schneider <asn@cryptomilk.org>
-Date: Mon, 7 Jun 2021 13:23:02 -0400
-Subject: [PATCH] On Samsung devices, we need to tell Audio HAL if we're
- running narrow band or wide band
-
-Change-Id: Ibfa0f632d9acbb920a85a613ce4e2f1d26556bd1
----
- .../android/bluetooth/hfp/HeadsetStateMachine.java    | 11 +++++++++++
- 1 file changed, 11 insertions(+)
-
-diff --git a/src/com/android/bluetooth/hfp/HeadsetStateMachine.java b/src/com/android/bluetooth/hfp/HeadsetStateMachine.java
-index 8a6bc5527..667f215b6 100644
---- a/src/com/android/bluetooth/hfp/HeadsetStateMachine.java
-+++ b/src/com/android/bluetooth/hfp/HeadsetStateMachine.java
-@@ -82,6 +82,9 @@ public class HeadsetStateMachine extends StateMachine {
-     private static final String HEADSET_WBS = "bt_wbs";
-     private static final String HEADSET_AUDIO_FEATURE_ON = "on";
-     private static final String HEADSET_AUDIO_FEATURE_OFF = "off";
-+    private static final String HEADSET_G_SCO_SAMPLERATE = "g_sco_samplerate";
-+    private static final String HEADSET_G_WB_SAMPLERATE = "16000";
-+    private static final String HEADSET_G_NB_SAMPLERATE = "8000";
- 
-     static final int CONNECT = 1;
-     static final int DISCONNECT = 2;
-@@ -1511,6 +1514,12 @@ public class HeadsetStateMachine extends StateMachine {
-                 HEADSET_WBS + "=" + mAudioParams.getOrDefault(HEADSET_WBS,
-                         HEADSET_AUDIO_FEATURE_OFF)
-         });
-+        keyValuePairs = keyValuePairs.concat(";"
-+                + HEADSET_G_SCO_SAMPLERATE
-+                + "="
-+                + mAudioParams.getOrDefault(
-+                    HEADSET_G_SCO_SAMPLERATE,
-+                    HEADSET_G_NB_SAMPLERATE));
-         Log.i(TAG, "setAudioParameters for " + mDevice + ": " + keyValuePairs);
-         mSystemInterface.getAudioManager().setParameters(keyValuePairs);
-     }
-@@ -1649,10 +1658,12 @@ public class HeadsetStateMachine extends StateMachine {
-         String prevWbs = mAudioParams.getOrDefault(HEADSET_WBS, HEADSET_AUDIO_FEATURE_OFF);
-         switch (wbsConfig) {
-             case HeadsetHalConstants.BTHF_WBS_YES:
-+                mAudioParams.put(HEADSET_G_SCO_SAMPLERATE, HEADSET_G_WB_SAMPLERATE);
-                 mAudioParams.put(HEADSET_WBS, HEADSET_AUDIO_FEATURE_ON);
-                 break;
-             case HeadsetHalConstants.BTHF_WBS_NO:
-             case HeadsetHalConstants.BTHF_WBS_NONE:
-+                mAudioParams.put(HEADSET_G_SCO_SAMPLERATE, HEADSET_G_NB_SAMPLERATE);
-                 mAudioParams.put(HEADSET_WBS, HEADSET_AUDIO_FEATURE_OFF);
-                 break;
-             default:
--- 
-2.25.1
-
diff --git a/patches_treble_phh/platform_packages_apps_Bluetooth/0001-Report-SCO-sample-rate-by-default.patch b/patches_treble_phh/platform_packages_apps_Bluetooth/0001-Report-SCO-sample-rate-by-default.patch
new file mode 100644
index 0000000..21c4f94
--- /dev/null
+++ b/patches_treble_phh/platform_packages_apps_Bluetooth/0001-Report-SCO-sample-rate-by-default.patch
@@ -0,0 +1,24 @@
+From aa4b834b2eeac1be385ced6d4a0b82aa867ed4d9 Mon Sep 17 00:00:00 2001
+From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
+Date: Mon, 10 Jan 2022 03:31:18 +0000
+Subject: [PATCH] Report SCO sample rate by default
+
+Change-Id: I12c14e2206f5dc20fefe30a2197798773a894988
+---
+ res/values/config.xml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/res/values/config.xml b/res/values/config.xml
+index adfc73583..fd8358788 100644
+--- a/res/values/config.xml
++++ b/res/values/config.xml
+@@ -118,5 +118,5 @@
+     <string name="exposure_notification_package">com.google.android.gms</string>
+ 
+     <!-- If true, SCO sample rate will be reported via g_sco_samplerate audio parameter -->
+-    <bool name="sco_report_samplerate">false</bool>
++    <bool name="sco_report_samplerate">true</bool>
+ </resources>
+-- 
+2.25.1
+