| commit | ff8a37351f1475c57cb3ff92b0773011f98407c1 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Mon Dec 28 21:07:52 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Dec 28 21:07:52 2020 +0000 |
| tree | 26e6b9e70b8ddab59bb3d72e6b010d263b941988 | |
| parent | 7f31d5fda4078a940a08d899182b5c1707da4bf8 [diff] | |
| parent | e86f94f7f6a88031720168b2ff3b58fc3dd1377a [diff] |
Merge "Audio: Fix automatic version replacement in IStreamOutEventCallback.hal" am: 85959e1682 am: e86f94f7f6 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1533854 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I00e9f280a5dfba734a9f5bf77def60d7643b0e89
diff --git a/audio/7.0/IStreamOutEventCallback.hal b/audio/7.0/IStreamOutEventCallback.hal index 52e65d3..4de767f 100644 --- a/audio/7.0/IStreamOutEventCallback.hal +++ b/audio/7.0/IStreamOutEventCallback.hal
@@ -42,7 +42,7 @@ * is TEST(metadata_tests, compatibility_R) [3]. The test for R compatibility for JNI * marshalling is android.media.cts.AudioMetadataTest#testCompatibilityR [4]. * - * R (audio HAL 7.0) defined keys are as follows [2]: + * R (audio HAL 6.0) defined keys are as follows [2]: * "bitrate", int32 * "channel-mask", int32 * "mime", string