From 7661bc43dfaa761390e26e95d8942cf94123e8fc Mon Sep 17 00:00:00 2001
From: Chungkai Mei <chungkai@google.com>
Date: Thu, 8 Dec 2022 09:44:24 +0000
Subject: [PATCH 1/4] Remove UClampThreshold hint

the file node was removed so also remove these
dummy setting

Bug: 260806701
Change-Id: I23044f7f32cf4b2b2cc93205ec5751525f05ee7f
Signed-off-by: Chungkai Mei <chungkai@google.com>
---
 powerhint.json | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/powerhint.json b/powerhint.json
index 8b6afcb..9e690d6 100644
--- a/powerhint.json
+++ b/powerhint.json
@@ -115,15 +115,6 @@
       ],
       "ResetOnInit": true
     },
-    {
-      "Name": "UClampThreshold",
-      "Path": "/proc/vendor_sched/uclamp_threshold",
-      "Values": [
-        "0",
-        "8"
-      ],
-      "ResetOnInit": true
-    },
     {
       "Name": "ReducePreferIdle",
       "Path": "/proc/vendor_sched/reduce_prefer_idle",
@@ -546,12 +537,6 @@
       "Duration": 1000,
       "Value": "0-3"
     },
-    {
-      "PowerHint": "LAUNCH",
-      "Node": "UClampThreshold",
-      "Duration": 5000,
-      "Value": "0"
-    },
     {
       "PowerHint": "LAUNCH",
       "Node": "ReducePreferIdle",

From 67442466d3f63815d65391dc75a0db98ff81f4f2 Mon Sep 17 00:00:00 2001
From: Sandeep Vijayasekar <sandv@google.com>
Date: Thu, 8 Dec 2022 21:18:24 +0000
Subject: [PATCH 2/4] [DO NOT MERGE] Revert "Revert "[AudioProxy] Enable
 AudioProxy""

This reverts commit 40e6ca666b02c6ea37ad648f599bbf33108409ed.

Reason for revert: fix breakage with ag/20681848

Change-Id: Ia62aaa17e94a426390e120cc0d811b67cf5739ae
---
 device-tangorpro.mk                           |  9 ++++++
 device_framework_matrix_product_tangorpro.xml | 29 +++++++++++++++++++
 public.libraries-google-tangorpro.txt         |  1 +
 3 files changed, 39 insertions(+)
 create mode 100644 device_framework_matrix_product_tangorpro.xml
 create mode 100644 public.libraries-google-tangorpro.txt

diff --git a/device-tangorpro.mk b/device-tangorpro.mk
index 68398cc..a2478e2 100644
--- a/device-tangorpro.mk
+++ b/device-tangorpro.mk
@@ -220,3 +220,12 @@ PRODUCT_SYSTEM_PROPERTIES += ro.odm.cast.ssid_suffix=ynn
 PRODUCT_PROPERTY_OVERRIDES += \
     persist.vendor.camera.extended_launch_boost=1 \
     persist.vendor.camera.raise_buf_allocation_priority=1
+# AudioProxy
+PRODUCT_PACKAGES += \
+    libaudio_proxy.google \
+    device.google.atv.audio_proxy@7.1-service
+
+DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE := device/google/tangorpro/device_framework_matrix_product_tangorpro.xml
+
+PRODUCT_COPY_FILES += \
+    device/google/tangorpro/public.libraries-google-tangorpro.txt:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/public.libraries-google.txt
diff --git a/device_framework_matrix_product_tangorpro.xml b/device_framework_matrix_product_tangorpro.xml
new file mode 100644
index 0000000..3974e7e
--- /dev/null
+++ b/device_framework_matrix_product_tangorpro.xml
@@ -0,0 +1,29 @@
+<compatibility-matrix version="1.0" type="framework" level="7">
+    <hal format="hidl">
+        <name>hardware.google.bluetooth.ccc</name>
+        <version>1.1</version>
+        <interface>
+            <name>IBluetoothCcc</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <!-- AudioProxy -->
+    <hal format="aidl" optional="true">
+        <name>device.google.atv.audio_proxy</name>
+        <version>1</version>
+        <interface>
+            <name>IAudioProxy</name>
+            <instance>mediashell</instance>
+        </interface>
+    </hal>
+    <hal format="hidl">
+        <name>android.hardware.audio</name>
+        <transport>hwbinder</transport>
+        <version>7.1</version>
+        <interface>
+            <name>IDevicesFactory</name>
+            <instance>mediashell</instance>
+        </interface>
+    </hal>
+</compatibility-matrix>
+
diff --git a/public.libraries-google-tangorpro.txt b/public.libraries-google-tangorpro.txt
new file mode 100644
index 0000000..2a2d2fe
--- /dev/null
+++ b/public.libraries-google-tangorpro.txt
@@ -0,0 +1 @@
+libaudio_proxy.google.so

From e90a6c516a5de9fb6a2651c2db69a094be124da1 Mon Sep 17 00:00:00 2001
From: Roshan Pius <rpius@google.com>
Date: Fri, 9 Dec 2022 01:45:52 +0000
Subject: [PATCH 3/4] uwb(t6pro): Add UWB framework overlays rro app

Bug: 261908320
Test: Compiles
Change-Id: If595d50f326deb427c34fb22525cbfc40f0e8923
---
 device-tangorpro.mk                           |  4 ++-
 rro_overlays/UwbOverlay/Android.bp            | 18 +++++++++++++
 rro_overlays/UwbOverlay/AndroidManifest.xml   | 27 +++++++++++++++++++
 rro_overlays/UwbOverlay/OWNERS                |  3 +++
 rro_overlays/UwbOverlay/res/values/config.xml | 20 ++++++++++++++
 5 files changed, 71 insertions(+), 1 deletion(-)
 create mode 100644 rro_overlays/UwbOverlay/Android.bp
 create mode 100644 rro_overlays/UwbOverlay/AndroidManifest.xml
 create mode 100644 rro_overlays/UwbOverlay/OWNERS
 create mode 100644 rro_overlays/UwbOverlay/res/values/config.xml

diff --git a/device-tangorpro.mk b/device-tangorpro.mk
index 8885301..ad0ef00 100644
--- a/device-tangorpro.mk
+++ b/device-tangorpro.mk
@@ -29,7 +29,9 @@ $(call inherit-product-if-exists, vendor/google_devices/tangorpro/proprietary/de
 
 DEVICE_PACKAGE_OVERLAYS += device/google/tangorpro/tangorpro/overlay
 PRODUCT_SOONG_NAMESPACES += device/google/tangorpro
-PRODUCT_PACKAGES += WifiOverlayT6pro
+PRODUCT_PACKAGES += \
+        UwbOverlayT6pro \
+        WifiOverlayT6pro
 
 # Disable camera flash and autofocus related xml with a disable flag.
 # This flag need to be set before device/google/gs201/device.mk
diff --git a/rro_overlays/UwbOverlay/Android.bp b/rro_overlays/UwbOverlay/Android.bp
new file mode 100644
index 0000000..aae93c4
--- /dev/null
+++ b/rro_overlays/UwbOverlay/Android.bp
@@ -0,0 +1,18 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "//device/google/tangorpro:device_google_tangorpro_license""
+    // to get the below license kinds:
+    //   SPDX-license-identifier-Apache-2.0
+    default_applicable_licenses: [
+        "//device/google/tangorpro:device_google_tangorpro_license",
+    ],
+}
+
+runtime_resource_overlay {
+    name: "UwbOverlayT6pro",
+    theme: "UwbOverlayT6pro",
+    certificate: "platform",
+    sdk_version: "current",
+    product_specific: true
+}
diff --git a/rro_overlays/UwbOverlay/AndroidManifest.xml b/rro_overlays/UwbOverlay/AndroidManifest.xml
new file mode 100644
index 0000000..57dfd5b
--- /dev/null
+++ b/rro_overlays/UwbOverlay/AndroidManifest.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2022 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.
+-->
+<!-- Pixel specific uwb overlays -->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.uwb.resources.pixel"
+    android:versionCode="1"
+    android:versionName="1.0">
+    <application android:hasCode="false" />
+    <overlay
+      android:targetPackage="com.android.uwb.resources"
+      android:targetName="UwbCustomization"
+      android:isStatic="true"
+      android:priority="0"/>
+</manifest>
diff --git a/rro_overlays/UwbOverlay/OWNERS b/rro_overlays/UwbOverlay/OWNERS
new file mode 100644
index 0000000..2395d7f
--- /dev/null
+++ b/rro_overlays/UwbOverlay/OWNERS
@@ -0,0 +1,3 @@
+# People who can approve changes for submission
+include platform/packages/modules/Uwb:/OWNERS
+victorliu@google.com
diff --git a/rro_overlays/UwbOverlay/res/values/config.xml b/rro_overlays/UwbOverlay/res/values/config.xml
new file mode 100644
index 0000000..7a77d32
--- /dev/null
+++ b/rro_overlays/UwbOverlay/res/values/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+ * Copyright (C) 2022 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>
+</resources>

From f1ea15f5f4336b459476991358ddc6a42b4ea0fc Mon Sep 17 00:00:00 2001
From: Adam Bookatz <bookatz@google.com>
Date: Fri, 30 Sep 2022 15:18:42 +0000
Subject: [PATCH 4/4] Mark that device is not voice capable

"Voice" capable means that the device supports phone calls over the telephony network. So for this device, this should be false.

The impetus for this is that with voice capability defaulting to true, the Multiuser pannel asks the owner whether secondary users should be allowed to make phone calls/sms, which is inapplicable. Changing the value to false should get rid of this option.

Bug: 248440908
Change-Id: If5249bc943c96f88c2ddd26880fe0626bb53592e
Test: manual
(cherry picked from commit 699275b04d85dde5645034cdeca19207b0bde632)
---
 .../overlay/frameworks/base/core/res/res/values/config.xml     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tangorpro/overlay/frameworks/base/core/res/res/values/config.xml b/tangorpro/overlay/frameworks/base/core/res/res/values/config.xml
index 5a4bcab..87e04df 100644
--- a/tangorpro/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/tangorpro/overlay/frameworks/base/core/res/res/values/config.xml
@@ -574,6 +574,9 @@
     <!-- This device does not allow sms service. -->
     <bool name="config_sms_capable">false</bool>
 
+    <!-- This device is not "voice capable". -->
+    <bool name="config_voice_capable">false</bool>
+
     <!-- This device is a wifi only tablet which does not support WEA.
          It should not receive CB messages. -->
     <bool name="config_disable_all_cb_messages">true</bool>