From 63d94a4e6b2c9af6208763f5122f392c194945a3 Mon Sep 17 00:00:00 2001
From: Joy Babafemi <jbabs@google.com>
Date: Mon, 20 Sep 2021 16:08:50 +0000
Subject: [PATCH] DO NOT MERGE: Set default UWB state on.

(Cherry-picked from sc-qpr branch)

Bug: 200101822
Bug: 212462949
Test: Manual
Change-Id: I426358779d354dcbcf1866e80d22c375dfd2e997
---
 services/uwb/java/com/android/server/uwb/UwbInjector.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/services/uwb/java/com/android/server/uwb/UwbInjector.java b/services/uwb/java/com/android/server/uwb/UwbInjector.java
index 7445e7f0c5915..379a2ff9411eb 100644
--- a/services/uwb/java/com/android/server/uwb/UwbInjector.java
+++ b/services/uwb/java/com/android/server/uwb/UwbInjector.java
@@ -91,8 +91,9 @@ public class UwbInjector {
             return Settings.Global.getInt(cr, Settings.Global.UWB_ENABLED)
                     == AdapterState.STATE_ENABLED_ACTIVE;
         } catch (Settings.SettingNotFoundException e) {
-            Settings.Global.putInt(cr, Settings.Global.UWB_ENABLED, AdapterState.STATE_DISABLED);
-            return false;
+            Settings.Global.putInt(cr, Settings.Global.UWB_ENABLED,
+                AdapterState.STATE_ENABLED_ACTIVE);
+            return true;
         }
     }
 }