From 14aee306254b9d06f481ea26a1008ac2bb67fac1 Mon Sep 17 00:00:00 2001
From: Joy Babafemi <jbabs@google.com>
Date: Tue, 24 Aug 2021 18:03:52 +0000
Subject: [PATCH 1/2] Initialize UwbManager only if supported on device.

Test: Manual
Bug: 197519749
Change-Id: I8346f4c2f3e3cc52e21a9214ab3fd428180c5d8d
Merged-In: I8346f4c2f3e3cc52e21a9214ab3fd428180c5d8d
---
 src/com/android/settings/uwb/UwbPreferenceController.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/uwb/UwbPreferenceController.java b/src/com/android/settings/uwb/UwbPreferenceController.java
index 15979b510cf..877c9f2f2b4 100644
--- a/src/com/android/settings/uwb/UwbPreferenceController.java
+++ b/src/com/android/settings/uwb/UwbPreferenceController.java
@@ -57,7 +57,9 @@ public class UwbPreferenceController extends TogglePreferenceController implemen
     public UwbPreferenceController(Context context, String key) {
         super(context, key);
         mExecutor = Executors.newSingleThreadExecutor();
-        mUwbManager = context.getSystemService(UwbManager.class);
+        if (isUwbSupportedOnDevice()) {
+            mUwbManager = context.getSystemService(UwbManager.class);
+        }
         mAirplaneModeOn = Settings.Global.getInt(mContext.getContentResolver(),
                 Settings.Global.AIRPLANE_MODE_ON, 0) == 1;
         mAirplaneModeChangedReceiver = new BroadcastReceiver() {

From 63976c2051f6f2c5531f24cfb41113c8ccb02b92 Mon Sep 17 00:00:00 2001
From: Joy Babafemi <jbabs@google.com>
Date: Wed, 25 Aug 2021 03:58:53 +0000
Subject: [PATCH 2/2] Revert "Revert "UWB: Re-enable UWB toggle""

This reverts commit 2e593b378466de933781e015076a292b4963c4e5.

Reason for revert: Root cause b/196317865 fixed

Bug: 197519749
Change-Id: Ib0fee46471c7f110b265faedc62a3f66610bf7c2
Merged-In: Ib0fee46471c7f110b265faedc62a3f66610bf7c2
---
 res/xml/connected_devices_advanced.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/res/xml/connected_devices_advanced.xml b/res/xml/connected_devices_advanced.xml
index 3ff7d9975f8..85e4a762429 100644
--- a/res/xml/connected_devices_advanced.xml
+++ b/res/xml/connected_devices_advanced.xml
@@ -65,6 +65,13 @@
         android:icon="@drawable/ic_folder_vd_theme_24"
         android:title="@string/bluetooth_show_files_received_via_bluetooth"/>
 
+    <SwitchPreference
+        android:key="uwb_settings"
+        android:title="@string/uwb_settings_title"
+        android:order="100"
+        android:summary="@string/summary_placeholder"
+        settings:controller="com.android.settings.uwb.UwbPreferenceController"/>
+
     <PreferenceCategory
         android:key="dashboard_tile_placeholder"
         android:order="-8"/>