Merge "Add last connected device concept" (b035c081) · Commits · e / os / android_frameworks_av

services/audiopolicy/engine/common/Android.bp

100644 → 100755

+1 −0

Original line number	Diff line number	Diff line
		@@ -25,6 +25,7 @@ cc_library_static {
		"src/ProductStrategy.cpp",
		"src/VolumeCurve.cpp",
		"src/VolumeGroup.cpp",
		"src/LastRemovableMediaDevices.cpp",
		],
		cflags: [
		"-Wall",

services/audiopolicy/engine/common/include/EngineBase.h

100644 → 100755

+11 −5

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@
		#include <EngineInterface.h>
		#include <ProductStrategy.h>
		#include <VolumeGroup.h>
		#include <LastRemovableMediaDevices.h>

		namespace android {
		namespace audio_policy {
		@@ -49,10 +50,8 @@ public:
		return mForceUse[usage];
		}
		android::status_t setDeviceConnectionState(const sp<DeviceDescriptor> /devDesc/,
		audio_policy_dev_state_t /state/) override
		{
		return NO_ERROR;
		}
		audio_policy_dev_state_t /state/) override;

		product_strategy_t getProductStrategyForAttributes(
		const audio_attributes_t &attr) const override;

		@@ -86,6 +85,12 @@ public:

		status_t listAudioVolumeGroups(AudioVolumeGroupVector &groups) const override;

		std::vector<audio_devices_t> getLastRemovableMediaDevices(
		device_out_group_t group = GROUP_NONE) const
		{
		return mLastRemovableMediaDevices.getLastRemovableMediaDevices(group);
		}

		void dump(String8 *dst) const override;


		@@ -120,6 +125,7 @@ public:

		ProductStrategyMap mProductStrategies;
		VolumeGroupMap mVolumeGroups;
		LastRemovableMediaDevices mLastRemovableMediaDevices;
		audio_mode_t mPhoneState = AUDIO_MODE_NORMAL; /*< current phone state. /

		/** current forced use configuration. */

services/audiopolicy/engine/common/include/LastRemovableMediaDevices.h

0 → 100755

+52 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2019 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		#ifndef ANDROID_LAST_REMOVABLE_MEDIA_DEVICES_H
		#define ANDROID_LAST_REMOVABLE_MEDIA_DEVICES_H

		#include <vector>
		#include <HwModule.h>
		#include <system/audio_policy.h>

		namespace android {

		typedef enum {
		GROUP_NONE = -1,
		GROUP_WIRED,
		GROUP_BT_A2DP,
		NUM_GROUP
		} device_out_group_t;

		class LastRemovableMediaDevices
		{
		public:
		void setRemovableMediaDevices(sp<DeviceDescriptor> desc, audio_policy_dev_state_t state);
		std::vector<audio_devices_t> getLastRemovableMediaDevices(
		device_out_group_t group = GROUP_NONE) const;

		private:
		struct DeviceGroupDescriptor {
		sp<DeviceDescriptor> desc;
		device_out_group_t group;
		};
		std::vector<DeviceGroupDescriptor> mMediaDevices;

		device_out_group_t getDeviceOutGroup(audio_devices_t device) const;
		};

		} // namespace android

		#endif // ANDROID_LAST_REMOVABLE_MEDIA_DEVICES_H
		No newline at end of file

services/audiopolicy/engine/common/src/EngineBase.cpp

+11 −0

Original line number	Diff line number	Diff line
		@@ -63,6 +63,17 @@ status_t EngineBase::setPhoneState(audio_mode_t state)
		return NO_ERROR;
		}

		status_t EngineBase::setDeviceConnectionState(const sp<DeviceDescriptor> devDesc,
		audio_policy_dev_state_t state)
		{
		audio_devices_t deviceType = devDesc->type();
		if ((deviceType != AUDIO_DEVICE_NONE) && audio_is_output_device(deviceType)) {
		mLastRemovableMediaDevices.setRemovableMediaDevices(devDesc, state);
		}

		return NO_ERROR;
		}

		product_strategy_t EngineBase::getProductStrategyForAttributes(const audio_attributes_t &attr) const
		{
		return mProductStrategies.getProductStrategyForAttributes(attr);

services/audiopolicy/engine/common/src/LastRemovableMediaDevices.cpp

0 → 100755

+78 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2019 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		#define LOG_TAG "APM::AudioPolicyEngine/LastRemovableMediaDevices"
		//#define LOG_NDEBUG 0

		#include "LastRemovableMediaDevices.h"
		#include <log/log.h>

		namespace android {

		void LastRemovableMediaDevices::setRemovableMediaDevices(sp<DeviceDescriptor> desc,
		audio_policy_dev_state_t state)
		{
		if (desc == nullptr) {
		return;
		} else {
		if ((state == AUDIO_POLICY_DEVICE_STATE_AVAILABLE) &&
		(getDeviceOutGroup(desc->type()) != GROUP_NONE)) {
		setRemovableMediaDevices(desc, AUDIO_POLICY_DEVICE_STATE_UNAVAILABLE);
		mMediaDevices.insert(mMediaDevices.begin(), {desc, getDeviceOutGroup(desc->type())});
		} else if (state == AUDIO_POLICY_DEVICE_STATE_UNAVAILABLE) {
		for (auto iter = mMediaDevices.begin(); iter != mMediaDevices.end(); ++iter) {
		if ((iter->desc)->equals(desc)) {
		mMediaDevices.erase(iter);
		break;
		}
		}
		}
		}
		}

		std::vector<audio_devices_t> LastRemovableMediaDevices::getLastRemovableMediaDevices(
		device_out_group_t group) const
		{
		std::vector<audio_devices_t> ret;
		for (auto iter = mMediaDevices.begin(); iter != mMediaDevices.end(); ++iter) {
		if ((group == GROUP_NONE) \|\| (group == getDeviceOutGroup((iter->desc)->type()))) {
		ret.push_back((iter->desc)->type());
		}
		}
		return ret;
		}

		device_out_group_t LastRemovableMediaDevices::getDeviceOutGroup(audio_devices_t device) const
		{
		switch (device) {
		case AUDIO_DEVICE_OUT_WIRED_HEADPHONE:
		case AUDIO_DEVICE_OUT_LINE:
		case AUDIO_DEVICE_OUT_WIRED_HEADSET:
		case AUDIO_DEVICE_OUT_USB_HEADSET:
		case AUDIO_DEVICE_OUT_USB_ACCESSORY:
		case AUDIO_DEVICE_OUT_USB_DEVICE:
		case AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET:
		return GROUP_WIRED;
		case AUDIO_DEVICE_OUT_BLUETOOTH_A2DP:
		case AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES:
		case AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER:
		return GROUP_BT_A2DP;
		default:
		return GROUP_NONE;
		}
		}

		} // namespace android
		No newline at end of file