Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AudioSystem: startAudioSource: ensure port handle initialized

Browse Source 
In case of failure, port handle reported is not initialized
by JNI layer. Any failing call to native AudioSystem::startAudioSource
will not set the port handle, but returning an error status.
JNI checks for port handle validity rather than error status.

This CL ensures JNI checks first status to report an error, otherwise
asserts on handle validity.

Bug: 186088557
Test: make

Signed-off-by: Francois Gaffie <francois.gaffie@renault.com>
Change-Id: I4eb8046a1263aeb7d464d35a360a8adb77c4b1a5
This commit is contained in:
Francois Gaffie
2021-04-20 08:59:46 +02:00
committed by Eric Laurent
parent 011805bf48
commit 81b0519f04
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/jni/android_media_AudioSystem.cpp
View File

@@ -1930,7 +1930,11 @@ android_media_AudioSystem_startAudioSource(JNIEnv *env, jobject clazz,
audio_port_handle_t handle;
status_t status = AudioSystem::startAudioSource(&nAudioPortConfig, paa.get(), &handle);
ALOGV("AudioSystem::startAudioSource() returned %d handle %d", status, handle);
return handle > 0 ? handle : nativeToJavaStatus(status);
if (status != NO_ERROR) {
return nativeToJavaStatus(status);
}
ALOG_ASSERT(handle > 0, "%s: invalid handle reported on successful call", __func__);
return handle;
}
static jint