| commit | 96d33c46d67955d61cb92cc4a5323b1e9f8f6f5f | [log] [tgz] |
|---|---|---|
| author | Mikhail Naganov <mnaganov@google.com> | Fri Nov 22 10:21:47 2019 -0800 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Nov 22 10:21:47 2019 -0800 |
| tree | 9960590e1d29055d03e0e53a470db192e9cd6e0a | |
| parent | e7ac2536c52dfd8ea5abd967c12770d0e2a89d00 [diff] | |
| parent | 76d06d2d13577841dfbdbc7488a37ba3bfc05c04 [diff] |
Merge "libaudiohal: Call IDevice.close in HAL V6" am: 76d06d2d13 Change-Id: Ibee0b868e9d7a1b76effe3a45d97f8385e03b645
diff --git a/media/libaudiohal/impl/DeviceHalHidl.cpp b/media/libaudiohal/impl/DeviceHalHidl.cpp index b25f82e..1b648c9 100644 --- a/media/libaudiohal/impl/DeviceHalHidl.cpp +++ b/media/libaudiohal/impl/DeviceHalHidl.cpp
@@ -100,8 +100,12 @@ DeviceHalHidl::~DeviceHalHidl() { if (mDevice != 0) { +#if MAJOR_VERSION <= 5 mDevice.clear(); hardware::IPCThreadState::self()->flushCommands(); +#elif MAJOR_VERSION >= 6 + mDevice->close(); +#endif } }