From d92f08f9a295946d403fe6d4b32a3f297c8a0df6 Mon Sep 17 00:00:00 2001
From: Patty <plhuang@google.com>
Date: Wed, 6 Apr 2022 18:09:44 +0800
Subject: [PATCH 1/3] Add EWP bthal interface

Bug: 220121592
Test: Manual
Change-Id: I693379056b83c1dfc9345b3c2cb6d514d56986af
---
 bluetooth/manifest_bluetooth.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/bluetooth/manifest_bluetooth.xml b/bluetooth/manifest_bluetooth.xml
index d9a378e..e2f7cfa 100644
--- a/bluetooth/manifest_bluetooth.xml
+++ b/bluetooth/manifest_bluetooth.xml
@@ -35,4 +35,13 @@
             <instance>default</instance>
         </interface>
     </hal>
+    <hal format="hidl">
+        <name>hardware.google.bluetooth.ewp</name>
+        <transport>hwbinder</transport>
+        <version>1.0</version>
+        <interface>
+            <name>IBluetoothEwp</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
 </manifest>

From 92755e7a371c4de3c11d491083b63ff0df158b32 Mon Sep 17 00:00:00 2001
From: Patty <plhuang@google.com>
Date: Wed, 6 Apr 2022 20:53:16 +0800
Subject: [PATCH 2/3] Add ewp test tool in userdebug build

Bug: 220121592
Test: make; Test with /vendor/bin/hw/ewp_tool
Change-Id: Ifdb05187b2f46403befb0b087cec9a146e00f8d4
---
 device-cheetah.mk | 4 ++++
 device-panther.mk | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/device-cheetah.mk b/device-cheetah.mk
index ae89953..45dfe6f 100644
--- a/device-cheetah.mk
+++ b/device-cheetah.mk
@@ -233,6 +233,10 @@ PRODUCT_PRODUCT_PROPERTIES += \
     ro.bluetooth.leaudio_offload.supported=true \
     persist.bluetooth.leaudio_offload.disabled=false
 
+# Bluetooth EWP test tool
+PRODUCT_PACKAGES_DEBUG += \
+    ewp_tool
+
 # userdebug specific
 ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
     PRODUCT_COPY_FILES += \
diff --git a/device-panther.mk b/device-panther.mk
index 568d862..2565d92 100644
--- a/device-panther.mk
+++ b/device-panther.mk
@@ -225,6 +225,11 @@ PRODUCT_PRODUCT_PROPERTIES += \
     ro.bluetooth.leaudio_offload.supported=true \
     persist.bluetooth.leaudio_offload.disabled=false
 
+
+# Bluetooth EWP test tool
+PRODUCT_PACKAGES_DEBUG += \
+    ewp_tool
+
 # userdebug specific
 ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
     PRODUCT_COPY_FILES += \

From 0ae8841b8e5f3c9a11989008133474d1a1bea107 Mon Sep 17 00:00:00 2001
From: Avinash Malipatil <avinashmp@google.com>
Date: Tue, 19 Apr 2022 14:02:05 +0000
Subject: [PATCH 3/3] Enable ONS auto provisioning using device config

Bug: 229727068
Test: Manual. Flash the device with the binary including this change and check adb logs. ERR_AUTO_PROVISIONING_DISABLED should not be printed.
Change-Id: I826f86c9943573d25ffeb1ac9761a29c03bf4cc9
---
 .../res/values/config.xml                      | 18 ++++++++++++++++++
 .../res/values/config.xml                      | 18 ++++++++++++++++++
 2 files changed, 36 insertions(+)
 create mode 100644 cheetah/overlay/packages/services/AlternativeNetworkAccess/res/values/config.xml
 create mode 100644 panther/overlay/packages/services/AlternativeNetworkAccess/res/values/config.xml

diff --git a/cheetah/overlay/packages/services/AlternativeNetworkAccess/res/values/config.xml b/cheetah/overlay/packages/services/AlternativeNetworkAccess/res/values/config.xml
new file mode 100644
index 0000000..46c95af
--- /dev/null
+++ b/cheetah/overlay/packages/services/AlternativeNetworkAccess/res/values/config.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources>
+  <bool name="enable_ons_auto_provisioning">true</bool>
+</resources>
diff --git a/panther/overlay/packages/services/AlternativeNetworkAccess/res/values/config.xml b/panther/overlay/packages/services/AlternativeNetworkAccess/res/values/config.xml
new file mode 100644
index 0000000..46c95af
--- /dev/null
+++ b/panther/overlay/packages/services/AlternativeNetworkAccess/res/values/config.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources>
+  <bool name="enable_ons_auto_provisioning">true</bool>
+</resources>