commit d0912fc9616fd1364303ac07396016a4193ff2da
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sat May 28 16:24:26 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sat May 28 16:24:26 2022 +0000
tree 1aca3efa5e0fc641f18056d9dfdae86afb57a96f
parent 10d68dc0753388c68ea6955b1dd77da54d036c74
parent 824cdb5e38987f62da962fbe95e623457ee41520

Snap for 8654853 from 824cdb5e38987f62da962fbe95e623457ee41520 to t-keystone-qcom-release

Change-Id: I59515218fdd299e00ea20a8c5662f8e4c2ce0f05

service/java/com/android/server/uwb/UwbSessionManager.java

diff --git a/service/java/com/android/server/uwb/UwbSessionManager.java b/service/java/com/android/server/uwb/UwbSessionManager.java
index 29a79fb..76bae00 100644
--- a/service/java/com/android/server/uwb/UwbSessionManager.java
+++ b/service/java/com/android/server/uwb/UwbSessionManager.java
@@ -766,27 +766,26 @@
                                         }
                                     }
                                 }
-                            }
-                            if (status != UwbUciConstants.STATUS_CODE_OK) {
+                                if (status != UwbUciConstants.STATUS_CODE_OK) {
+                                    if (rangingReconfigureParams.getAction()
+                                            == MULTICAST_LIST_UPDATE_ACTION_ADD) {
+                                        mSessionNotificationManager.onControleeAddFailed(
+                                                uwbSession, status);
+                                    } else if (rangingReconfigureParams.getAction()
+                                            == MULTICAST_LIST_UPDATE_ACTION_DELETE) {
+                                        mSessionNotificationManager.onControleeRemoveFailed(
+                                                uwbSession, status);
+                                    }
+                                    return status;
+                                }
                                 if (rangingReconfigureParams.getAction()
                                         == MULTICAST_LIST_UPDATE_ACTION_ADD) {
-                                    mSessionNotificationManager.onControleeAddFailed(
-                                            uwbSession, status);
+                                    mSessionNotificationManager.onControleeAdded(uwbSession);
                                 } else if (rangingReconfigureParams.getAction()
                                         == MULTICAST_LIST_UPDATE_ACTION_DELETE) {
-                                    mSessionNotificationManager.onControleeRemoveFailed(
-                                            uwbSession, status);
+                                    mSessionNotificationManager.onControleeRemoved(uwbSession);
                                 }
-                                return status;
                             }
-                            if (rangingReconfigureParams.getAction()
-                                    == MULTICAST_LIST_UPDATE_ACTION_ADD) {
-                                mSessionNotificationManager.onControleeAdded(uwbSession);
-                            } else if (rangingReconfigureParams.getAction()
-                                    == MULTICAST_LIST_UPDATE_ACTION_DELETE) {
-                                mSessionNotificationManager.onControleeRemoved(uwbSession);
-                            }
-
                             status = mConfigurationManager.setAppConfigurations(
                                     uwbSession.getSessionId(), param);
                             Log.d(TAG, "status: " + status);