Revert "uwb(service): Cleanup any ongoing sessions when country code changes"

This reverts commit e3d9ab7ed1935049af664328402b9b1d5cc25071.

Reason for revert: We are working with Qorvo handle this more cleanly.

Bug: 230037507
Test: atest ServiceUwbTests
Change-Id: If994ea3e74ad32934f79e0a40a25c9cb466a83bc

2 files changed, 2 insertions, 31 deletions

diff --git a/service/java/com/android/server/uwb/UwbServiceCore.java b/service/java/com/android/server/uwb/UwbServiceCore.java
index e9dc9a3a..049ea971 100644
--- a/service/java/com/android/server/uwb/UwbServiceCore.java
+++ b/service/java/com/android/server/uwb/UwbServiceCore.java
@@ -76,7 +76,6 @@ public class UwbServiceCore implements INativeUwbManager.DeviceNotification,
 
     private static final int TASK_ENABLE = 1;
     private static final int TASK_DISABLE = 2;
-    private static final int TASK_DEINIT_ALL_SESSIONS = 3;
 
     private static final int WATCHDOG_MS = 10000;
     private static final int SEND_VENDOR_CMD_TIMEOUT_MS = 10000;
@@ -172,7 +171,7 @@ public class UwbServiceCore implements INativeUwbManager.DeviceNotification,
 
     @Override
     public void onDeviceStatusNotificationReceived(int deviceState) {
-        // If error state is received, toggle UWB off to reset stack state.
+        // If error status is received, toggle UWB off to reset stack state.
         // TODO(b/227488208): Should we try to restart (like wifi) instead?
         if ((byte) deviceState == UwbUciConstants.DEVICE_STATE_ERROR) {
             Log.e(TAG, "Error device status received. Disabling...");
@@ -216,10 +215,6 @@ public class UwbServiceCore implements INativeUwbManager.DeviceNotification,
 
     @Override
     public void onCountryCodeChanged(@Nullable String countryCode) {
-        // If there are ongoing sessions, then we should use this trigger to close all of them
-        // and send notifications to apps.
-        Log.v(TAG, "Closing ongoing sessions on country code change");
-        mEnableDisableTask.execute(TASK_DEINIT_ALL_SESSIONS);
         // Clear the cached capabilities on country code changes.
         Log.v(TAG, "Clearing cached specification params on country code change");
         mUwbSpecificationInfo.clear();
@@ -497,11 +492,6 @@ public class UwbServiceCore implements INativeUwbManager.DeviceNotification,
                     mSessionManager.deinitAllSession();
                     disableInternal();
                     break;
-
-                case TASK_DEINIT_ALL_SESSIONS:
-                    mSessionManager.deinitAllSession();
-                    break;
-
                 default:
                     Log.d(TAG, "EnableDisableTask : Undefined Task");
                     break;
diff --git a/service/tests/src/com/android/server/uwb/UwbServiceCoreTest.java b/service/tests/src/com/android/server/uwb/UwbServiceCoreTest.java
index cde76558..51ca342d 100644
--- a/service/tests/src/com/android/server/uwb/UwbServiceCoreTest.java
+++ b/service/tests/src/com/android/server/uwb/UwbServiceCoreTest.java
@@ -302,7 +302,6 @@ public class UwbServiceCoreTest {
 
         disableUwb();
 
-        verify(mUwbSessionManager).deinitAllSession();
         verify(mNativeUwbManager).doDeinitialize();
         verify(cb).onAdapterStateChanged(UwbManager.AdapterStateCallback.STATE_DISABLED,
                 StateChangeReason.SYSTEM_POLICY);
@@ -324,7 +323,6 @@ public class UwbServiceCoreTest {
 
         disableUwb();
 
-        verify(mUwbSessionManager).deinitAllSession();
         verify(mNativeUwbManager).doDeinitialize();
         verify(cb).onAdapterStateChanged(UwbManager.AdapterStateCallback.STATE_DISABLED,
                 StateChangeReason.SYSTEM_POLICY);
@@ -661,7 +659,7 @@ public class UwbServiceCoreTest {
     }
 
     @Test
-    public void testToggleOffOnDeviceStateErrorCallback() throws Exception {
+    public void testToggleOfOnDeviceStateErrorCallback() throws Exception {
         IUwbAdapterStateCallbacks cb = mock(IUwbAdapterStateCallbacks.class);
         when(cb.asBinder()).thenReturn(mock(IBinder.class));
         mUwbServiceCore.registerAdapterStateCallbacks(cb);
@@ -675,29 +673,12 @@ public class UwbServiceCoreTest {
         mUwbServiceCore.onDeviceStatusNotificationReceived(UwbUciConstants.DEVICE_STATE_ERROR);
         mTestLooper.dispatchAll();
         // Verify UWB toggle off.
-        verify(mUwbSessionManager).deinitAllSession();
         verify(mNativeUwbManager).doDeinitialize();
         verify(cb).onAdapterStateChanged(UwbManager.AdapterStateCallback.STATE_DISABLED,
                 StateChangeReason.SYSTEM_POLICY);
     }
 
     @Test
-    public void testDeinitAllSessionsOnCountryCodeChange() throws Exception {
-        IUwbAdapterStateCallbacks cb = mock(IUwbAdapterStateCallbacks.class);
-        when(cb.asBinder()).thenReturn(mock(IBinder.class));
-        mUwbServiceCore.registerAdapterStateCallbacks(cb);
-
-        enableUwb();
-        verify(cb).onAdapterStateChanged(UwbManager.AdapterStateCallback.STATE_ENABLED_INACTIVE,
-                StateChangeReason.SYSTEM_POLICY);
-
-        mUwbServiceCore.onCountryCodeChanged("US");
-        mTestLooper.dispatchAll();
-        // Verify on session cleanup
-        verify(mUwbSessionManager).deinitAllSession();
-    }
-
-    @Test
     public void testVendorUciNotificationCallback() throws Exception {
         enableUwb();