From fffeac819db1a4d90f858eebe1238504ea4b74f5 Mon Sep 17 00:00:00 2001
From: Eric Laurent <elaurent@google.com>
Date: Thu, 17 Jan 2019 09:03:47 -0800
Subject: audio: Enable API for BT to query offload A2DP encoding formats

Connect AudioSystem JNI to native implementation of the mechanism
to query offload A2DP encoding formats supported on primary HAL.

Bug: 111812273
Test: make
Change-Id: Ie94f8fa2b9900fca8658f15bf1cb1be80d9e0047
---
 core/jni/android_media_AudioSystem.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/core/jni/android_media_AudioSystem.cpp b/core/jni/android_media_AudioSystem.cpp
index b7845a782048..0d8ede794b73 100644
--- a/core/jni/android_media_AudioSystem.cpp
+++ b/core/jni/android_media_AudioSystem.cpp
@@ -2039,10 +2039,8 @@ android_media_AudioSystem_getHwOffloadEncodingFormatsSupportedForA2DP(
         return (jint)AUDIO_JAVA_BAD_VALUE;
     }
     std::vector<audio_format_t> encodingFormats;
-    //FIXME: enable when native implementaiton is merged
-    //status_t status = AudioSystem::getHwOffloadEncodingFormatsSupportedForA2DP(
-    //                      &encodingFormats);
-    status_t status = NO_ERROR;
+    status_t status = AudioSystem::getHwOffloadEncodingFormatsSupportedForA2DP(
+                          &encodingFormats);
     if (status != NO_ERROR) {
         ALOGE("%s: error %d", __FUNCTION__, status);
         jStatus = nativeToJavaStatus(status);
-- 
cgit v1.2.3-59-g8ed1b