diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-06-11 15:48:54 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-06-11 15:48:54 +0000 |
| commit | ee1ba307a316cbdbdd5747216a694d15fadf70b1 (patch) | |
| tree | 2e911345fa75e2a521f98e3befe57ed6ca245877 | |
| parent | 5d8ee581c60314eb09074f1ce972ad5d48c5eb0c (diff) | |
| parent | 987f2d03f016890894f5bf1f0bfad0117913c4d1 (diff) | |
| download | Uwb-t_frc_art_330443060.tar.gz | |
Snap for 8712302 from 987f2d03f016890894f5bf1f0bfad0117913c4d1 to tm-frc-art-releaset_frc_art_330443060android13-frc-art-release
Change-Id: If4c11b26f257f530f58529712c054cf7d6dfde2e
| -rw-r--r-- | apex/apex_manifest.json | 2 | ||||
| -rw-r--r-- | service/java/com/android/server/uwb/UwbSessionManager.java | 29 |
2 files changed, 15 insertions, 16 deletions
diff --git a/apex/apex_manifest.json b/apex/apex_manifest.json index ef8be342..88baf791 100644 --- a/apex/apex_manifest.json +++ b/apex/apex_manifest.json @@ -1,5 +1,5 @@ { "name": "com.android.uwb", - "version": 330090000 + "version": 339990000 } diff --git a/service/java/com/android/server/uwb/UwbSessionManager.java b/service/java/com/android/server/uwb/UwbSessionManager.java index 29a79fb0..76bae008 100644 --- a/service/java/com/android/server/uwb/UwbSessionManager.java +++ b/service/java/com/android/server/uwb/UwbSessionManager.java @@ -766,27 +766,26 @@ public class UwbSessionManager implements INativeUwbManager.SessionNotification } } } - } - 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); |