commit 10edfcf70857cc0a22afbbd3fc8f57f0c8a2953a
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Nov 17 18:26:34 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Nov 17 18:26:34 2017 +0000
tree 4d26b37f91720dd435ed96cdd94850a8745c34a1
parent 068fe16a1b8f511046ba787f33605c0ac64f1ab5
parent ebe144c6709aeb1a09ca2223f7f9c0acb4f9f22d

Merge "libaudiohal: Add optional "msd" devices factory"

media/libaudiohal/DevicesFactoryHalHidl.cpp

diff --git a/media/libaudiohal/DevicesFactoryHalHidl.cpp b/media/libaudiohal/DevicesFactoryHalHidl.cpp
index 31da263..5b33592 100644
--- a/media/libaudiohal/DevicesFactoryHalHidl.cpp
+++ b/media/libaudiohal/DevicesFactoryHalHidl.cpp
@@ -43,6 +43,9 @@
         ALOGE("Failed to obtain IDevicesFactory service, terminating process.");
         exit(1);
     }
+    // The MSD factory is optional
+    mDevicesFactoryMsd = IDevicesFactory::getService(AUDIO_HAL_SERVICE_NAME_MSD);
+    // TODO: Register death handler, and add 'restart' directive to audioserver.rc
 }
 
 DevicesFactoryHalHidl::~DevicesFactoryHalHidl() {

media/libaudiohal/DevicesFactoryHalHidl.h

diff --git a/media/libaudiohal/DevicesFactoryHalHidl.h b/media/libaudiohal/DevicesFactoryHalHidl.h
index e2f1ad1..0748849 100644
--- a/media/libaudiohal/DevicesFactoryHalHidl.h
+++ b/media/libaudiohal/DevicesFactoryHalHidl.h
@@ -39,6 +39,7 @@
     friend class DevicesFactoryHalHybrid;
 
     sp<IDevicesFactory> mDevicesFactory;
+    sp<IDevicesFactory> mDevicesFactoryMsd;
 
     static status_t nameFromHal(const char *name, IDevicesFactory::Device *device);