aaudio: fix sessionId conversion
Was not handling negative IDs correctly.
Update test to allow negative IDs.
Bug: 72333892
Test: CTS has test_session_id
Change-Id: I1ca57026d6202f7d54c8efd51b14854be6cc69e4
diff --git a/media/libaaudio/src/utility/AAudioUtilities.cpp b/media/libaaudio/src/utility/AAudioUtilities.cpp
index adc4904..854c691 100644
--- a/media/libaaudio/src/utility/AAudioUtilities.cpp
+++ b/media/libaaudio/src/utility/AAudioUtilities.cpp
@@ -251,8 +251,8 @@
}
audio_session_t AAudioConvert_aaudioToAndroidSessionId(aaudio_session_id_t sessionId) {
- // If not a valid sessionId then convert to a safe value of AUDIO_SESSION_ALLOCATE.
- return (sessionId < AAUDIO_SESSION_ID_MIN)
+ // If not a regular sessionId then convert to a safe value of AUDIO_SESSION_ALLOCATE.
+ return (sessionId == AAUDIO_SESSION_ID_ALLOCATE || sessionId == AAUDIO_SESSION_ID_NONE)
? AUDIO_SESSION_ALLOCATE
: (audio_session_t) sessionId;
}
diff --git a/media/libaaudio/src/utility/AAudioUtilities.h b/media/libaaudio/src/utility/AAudioUtilities.h
index 3673c34..dc6a671 100644
--- a/media/libaaudio/src/utility/AAudioUtilities.h
+++ b/media/libaaudio/src/utility/AAudioUtilities.h
@@ -27,9 +27,6 @@
#include "aaudio/AAudio.h"
-
-constexpr aaudio_session_id_t AAUDIO_SESSION_ID_MIN = 1; // must be positive
-
/**
* Convert an AAudio result into the closest matching Android status.
*/