Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 70b9a15d authored Nov 18, 2016 by Martijn Coenen

Use newly introduced hidl_handle.

Bug: 32089785
Test: builds
Change-Id: I27c7d3945e1fe390661bf322987011a00fe9b3fe

parent c296154a

audio/2.0/default/Device.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -520,7 +520,7 @@ Return<Result> Device::setParameters(const hidl_vec<ParameterValue>& parameters)
		return setParametersImpl(parameters);
		}

		Return<void> Device::debugDump(const native_handle_t* fd) {
		Return<void> Device::debugDump(const hidl_handle& fd) {
		if (fd->numFds == 1) {
		analyzeStatus("dump", mDevice->dump(mDevice, fd->data[0]));
		}

audio/2.0/default/Device.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -102,7 +102,7 @@ struct Device : public IDevice, public ParametersUtil {
		Return<void> getParameters(
		const hidl_vec<hidl_string>& keys, getParameters_cb _hidl_cb) override;
		Return<Result> setParameters(const hidl_vec<ParameterValue>& parameters) override;
		Return<void> debugDump(const native_handle_t* fd) override;
		Return<void> debugDump(const hidl_handle& fd) override;

		// Utility methods for extending interfaces.
		Result analyzeStatus(const char* funcName, int status);

audio/2.0/default/PrimaryDevice.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -119,7 +119,7 @@ Return<Result> PrimaryDevice::setParameters(const hidl_vec<ParameterValue>& para
		return mDevice->setParameters(parameters);
		}

		Return<void> PrimaryDevice::debugDump(const native_handle_t* fd) {
		Return<void> PrimaryDevice::debugDump(const hidl_handle& fd) {
		return mDevice->debugDump(fd);
		}

audio/2.0/default/PrimaryDevice.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -88,7 +88,7 @@ struct PrimaryDevice : public IPrimaryDevice {
		Return<void> getParameters(
		const hidl_vec<hidl_string>& keys, getParameters_cb _hidl_cb) override;
		Return<Result> setParameters(const hidl_vec<ParameterValue>& parameters) override;
		Return<void> debugDump(const native_handle_t* fd) override;
		Return<void> debugDump(const hidl_handle& fd) override;

		// Methods from ::android::hardware::audio::V2_0::IPrimaryDevice follow.
		Return<Result> setVoiceVolume(float volume) override;

audio/2.0/default/Stream.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -222,7 +222,7 @@ Return<Result> Stream::setParameters(const hidl_vec<ParameterValue>& parameters)
		return setParametersImpl(parameters);
		}

		Return<void> Stream::debugDump(const native_handle_t* fd) {
		Return<void> Stream::debugDump(const hidl_handle& fd) {
		if (fd->numFds == 1) {
		analyzeStatus("dump", mStream->dump(mStream, fd->data[0]));
		}