1 files changed, 6 insertions, 9 deletions
diff --git a/core/java/android/uwb/AdapterStateListener.java b/core/java/android/uwb/AdapterStateListener.java
index 91847f740953..7e82cc6318f7 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();
             }
+
         }
     }