From b0da70ba29bbfecedc745cd7beb3abfb5f45b67d Mon Sep 17 00:00:00 2001
From: Joy Babafemi <jbabs@google.com>
Date: Fri, 11 Jun 2021 04:03:52 +0000
Subject: [PATCH] Remove mIsRegistered check for setUwbEnabled

Settings is the only client that uses the setUwbEnabled API and does not
need to register a callback.
Bug: 190599683
Test: CTS and Robotest

Change-Id: I2f360189c03b74f2636410dc21fda7041a35f376
---
 core/java/android/uwb/AdapterStateListener.java | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/core/java/android/uwb/AdapterStateListener.java b/core/java/android/uwb/AdapterStateListener.java
index 91847f7409530..7e82cc6318f7b 100644
--- a/core/java/android/uwb/AdapterStateListener.java
+++ b/core/java/android/uwb/AdapterStateListener.java
@@ -108,16 +108,13 @@ public class AdapterStateListener extends IUwbAdapterStateCallbacks.Stub {
      */
     public void setEnabled(boolean isEnabled) {
         synchronized (this) {
-            if (!mIsRegistered) {
-                return;
-            } else {
-                try {
-                    mAdapter.setEnabled(isEnabled);
-                } catch (RemoteException e) {
-                    Log.w(TAG, "Failed to set adapter state");
-                    throw e.rethrowFromSystemServer();
-                }
+            try {
+                mAdapter.setEnabled(isEnabled);
+            } catch (RemoteException e) {
+                Log.w(TAG, "Failed to set adapter state");
+                throw e.rethrowFromSystemServer();
             }
+
         }
     }