Revert "audiohal: Get rid of multiple inheritance in IDevice implementation"
This reverts commit e4228e7aa683044e17e6592c9014b5d4691445e7.
Further analysis of the bug has shown that the problem is not related
to the use of multiple inheritance.
Bug: 36225019
Change-Id: Icdcaf84061c0ecf29f891521bd961c3ee89f1cfc
diff --git a/audio/2.0/default/ParametersUtil.h b/audio/2.0/default/ParametersUtil.h
index 603e336..49036dc 100644
--- a/audio/2.0/default/ParametersUtil.h
+++ b/audio/2.0/default/ParametersUtil.h
@@ -37,23 +37,22 @@
class ParametersUtil {
public:
- virtual ~ParametersUtil() = default;
- Result getParam(const char* name, bool* value);
- Result getParam(const char* name, int* value);
- Result getParam(const char* name, String8* value);
- void getParametersImpl(
- const hidl_vec<hidl_string>& keys,
- std::function<void(Result retval,
- const hidl_vec<ParameterValue>& parameters)>
- cb);
- std::unique_ptr<AudioParameter> getParams(const AudioParameter& keys);
- Result setParam(const char* name, bool value);
- Result setParam(const char* name, int value);
- Result setParam(const char* name, const char* value);
- Result setParametersImpl(const hidl_vec<ParameterValue>& parameters);
- Result setParams(const AudioParameter& param);
+ Result getParam(const char* name, bool* value);
+ Result getParam(const char* name, int* value);
+ Result getParam(const char* name, String8* value);
+ void getParametersImpl(
+ const hidl_vec<hidl_string>& keys,
+ std::function<void(Result retval, const hidl_vec<ParameterValue>& parameters)> cb);
+ std::unique_ptr<AudioParameter> getParams(const AudioParameter& keys);
+ Result setParam(const char* name, bool value);
+ Result setParam(const char* name, int value);
+ Result setParam(const char* name, const char* value);
+ Result setParametersImpl(const hidl_vec<ParameterValue>& parameters);
+ Result setParams(const AudioParameter& param);
protected:
+ virtual ~ParametersUtil() {}
+
virtual char* halGetParameters(const char* keys) = 0;
virtual int halSetParameters(const char* keysAndValues) = 0;
};