commit 361b0ff6303512751b8a22b3a9ddefee0797536d
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Feb 22 02:01:12 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Feb 22 02:01:12 2019 +0000
tree 4deda8ea2cf06060caf5393d45497a086cc06840
parent 7a2f8152b1116c40b48cb78cfc8c05d7c5e56b08
parent ae1f662a30fe5aea14a020111fe245b2fad3e5b5

Merge "libaudiohal: Allow get/setMasterVolume invocation on IDevice"

media/libaudiohal/impl/DeviceHalHidl.cpp

diff --git a/media/libaudiohal/impl/DeviceHalHidl.cpp b/media/libaudiohal/impl/DeviceHalHidl.cpp
index a1e869f..b25f82e 100644
--- a/media/libaudiohal/impl/DeviceHalHidl.cpp
+++ b/media/libaudiohal/impl/DeviceHalHidl.cpp
@@ -123,15 +123,13 @@
 
 status_t DeviceHalHidl::setMasterVolume(float volume) {
     if (mDevice == 0) return NO_INIT;
-    if (mPrimaryDevice == 0) return INVALID_OPERATION;
-    return processReturn("setMasterVolume", mPrimaryDevice->setMasterVolume(volume));
+    return processReturn("setMasterVolume", mDevice->setMasterVolume(volume));
 }
 
 status_t DeviceHalHidl::getMasterVolume(float *volume) {
     if (mDevice == 0) return NO_INIT;
-    if (mPrimaryDevice == 0) return INVALID_OPERATION;
     Result retval;
-    Return<void> ret = mPrimaryDevice->getMasterVolume(
+    Return<void> ret = mDevice->getMasterVolume(
             [&](Result r, float v) {
                 retval = r;
                 if (retval == Result::OK) {