Merge "Audio: Add latency mode APIs for HAL V7.1"android-s-v2-beta-3android-s-qpr3-beta-1android-s-v2-beta-3android-s-qpr3-beta-1

2 files changed, 23 insertions, 0 deletions

diff --git a/audio/stream_out.cpp b/audio/stream_out.cpp
index 3ba1dd8b..63b157f4 100644
--- a/audio/stream_out.cpp
+++ b/audio/stream_out.cpp
@@ -514,6 +514,23 @@ Return<Result> StreamOut::setPlaybackRateParameters(const PlaybackRate &playback
     return FAILURE(Result::NOT_SUPPORTED);
 }
 
+#if MAJOR_VERSION == 7 && MINOR_VERSION == 1
+Return<Result> StreamOut::setLatencyMode(LatencyMode mode __unused) {
+    return FAILURE(Result::NOT_SUPPORTED);
+};
+
+Return<void> StreamOut::getRecommendedLatencyModes(getRecommendedLatencyModes_cb _hidl_cb) {
+    hidl_vec<LatencyMode> hidlModes;
+    _hidl_cb(Result::NOT_SUPPORTED, hidlModes);
+    return Void();
+};
+
+Return<Result> StreamOut::setLatencyModeCallback(
+        const sp<IStreamOutLatencyModeCallback>& callback __unused) {
+    return FAILURE(Result::NOT_SUPPORTED);
+};
+#endif
+
 void StreamOut::setMasterVolume(float masterVolume) {
     std::lock_guard<std::mutex> guard(mMutex);
     mMasterVolume = masterVolume;
diff --git a/audio/stream_out.h b/audio/stream_out.h
index 88e30e50..75dbbfa6 100644
--- a/audio/stream_out.h
+++ b/audio/stream_out.h
@@ -95,6 +95,12 @@ struct StreamOut : public IStreamOut {
     Return<Result> setAudioDescriptionMixLevel(float leveldB) override;
     Return<void> getPlaybackRateParameters(getPlaybackRateParameters_cb _hidl_cb) override;
     Return<Result> setPlaybackRateParameters(const PlaybackRate &playbackRate) override;
+#if MAJOR_VERSION == 7 && MINOR_VERSION == 1
+    Return<Result> setLatencyMode(LatencyMode mode) override;
+    Return<void> getRecommendedLatencyModes(getRecommendedLatencyModes_cb _hidl_cb) override;
+    Return<Result> setLatencyModeCallback(
+            const sp<IStreamOutLatencyModeCallback>& callback) override;
+#endif
 
     void setMasterVolume(float volume);
     float getEffectiveVolume() const { return mEffectiveVolume; }