Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 11:36:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Changing package for audio_policy_configuration_V7_0" am: a173639924 am: b5cb89cfbf

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1518401

Change-Id: I2c614a01626aca0e167b5092705d8c0cdc6db9aa
This commit is contained in:
Treehugger Robot
2020-12-07 19:21:23 +00:00
committed by Automerger Merge Worker
parent ad31d882f0 b5cb89cfbf
commit 9303e15d1b
7 changed files with 461 additions and 460 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
audio/7.0/config/Android.bp
View File

@@ -1,5 +1,6 @@
xsd_config {
name: "audio_policy_configuration_V7_0",
srcs: ["audio_policy_configuration.xsd"],
package_name: "audio.policy.configuration.V7_0",
package_name: "android.audio.policy.configuration.V7_0",
nullability: true,
}

878
audio/7.0/config/api/current.txt
View File

File diff suppressed because it is too large Load Diff

12
audio/common/7.0/enums/include/audio_policy_configuration_V7_0-enums.h → audio/common/7.0/enums/include/android_audio_policy_configuration_V7_0-enums.h
View File

@@ -14,14 +14,14 @@
* limitations under the License.
*/
#ifndef AUDIO_POLICY_CONFIGURATION_V7_0_ENUMS_H
#define AUDIO_POLICY_CONFIGURATION_V7_0_ENUMS_H
#ifndef ANDROID_AUDIO_POLICY_CONFIGURATION_V7_0_ENUMS_H
#define ANDROID_AUDIO_POLICY_CONFIGURATION_V7_0_ENUMS_H
#include <sys/types.h>
#include <audio_policy_configuration_V7_0.h>
#include <android_audio_policy_configuration_V7_0.h>
namespace audio::policy::configuration::V7_0 {
namespace android::audio::policy::configuration::V7_0 {
static inline size_t getChannelCount(AudioChannelMask mask) {
switch (mask) {
@@ -210,6 +210,6 @@ static inline bool isOutputDevice(const std::string& device) {
return isOutputDevice(stringToAudioDevice(device));
}
} // namespace audio::policy::configuration::V7_0
} // namespace android::audio::policy::configuration::V7_0
#endif // AUDIO_POLICY_CONFIGURATION_V7_0_ENUMS_H
#endif // ANDROID_AUDIO_POLICY_CONFIGURATION_V7_0_ENUMS_H

4
audio/common/7.0/example/Effect.cpp
View File

@@ -17,7 +17,7 @@
#define LOG_TAG "EffectsFactory7.0"
#include <log/log.h>
#include <audio_policy_configuration_V7_0.h>
#include <android_audio_policy_configuration_V7_0.h>
#include "Effect.h"
@@ -28,7 +28,7 @@ using ::android::hardware::Void;
using namespace ::android::hardware::audio::common::V7_0;
// Make an alias for enumerations generated from the APM config XSD.
namespace xsd {
using namespace ::audio::policy::configuration::V7_0;
using namespace ::android::audio::policy::configuration::V7_0;
}
namespace android::hardware::audio::effect::V7_0::implementation {

8
audio/core/all-versions/vts/functional/4.0/AudioPrimaryHidlHalTest.cpp
View File

@@ -17,7 +17,7 @@
#include "AudioPrimaryHidlHalTest.h"
#if MAJOR_VERSION >= 7
#include <audio_policy_configuration_V7_0.h>
#include <android_audio_policy_configuration_V7_0.h>
#include <xsdc/XsdcSupport.h>
using android::xsdc_enum_range;
@@ -236,7 +236,7 @@ TEST_P(InputStreamTest, updateSinkMetadata) {
#if MAJOR_VERSION <= 6
hidl_enum_range<AudioSource> range;
#elif MAJOR_VERSION >= 7
xsdc_enum_range<audio::policy::configuration::V7_0::AudioSource> range;
xsdc_enum_range<android::audio::policy::configuration::V7_0::AudioSource> range;
#endif
// Test all possible track configuration
for (auto source : range) {
@@ -272,8 +272,8 @@ TEST_P(OutputStreamTest, updateSourceMetadata) {
hidl_enum_range<AudioUsage> usageRange;
hidl_enum_range<AudioContentType> contentRange;
#elif MAJOR_VERSION >= 7
xsdc_enum_range<audio::policy::configuration::V7_0::AudioUsage> usageRange;
xsdc_enum_range<audio::policy::configuration::V7_0::AudioContentType> contentRange;
xsdc_enum_range<android::audio::policy::configuration::V7_0::AudioUsage> usageRange;
xsdc_enum_range<android::audio::policy::configuration::V7_0::AudioContentType> contentRange;
#endif
// Test all possible track configuration
for (auto usage : usageRange) {

6
audio/core/all-versions/vts/functional/AudioPrimaryHidlHalTest.h
View File

@@ -43,8 +43,8 @@
#include PATH(android/hardware/audio/FILE_VERSION/types.h)
#include PATH(android/hardware/audio/common/FILE_VERSION/types.h)
#if MAJOR_VERSION >= 7
#include <audio_policy_configuration_V7_0-enums.h>
#include <audio_policy_configuration_V7_0.h>
#include <android_audio_policy_configuration_V7_0-enums.h>
#include <android_audio_policy_configuration_V7_0.h>
#endif
#include <fmq/EventFlag.h>
@@ -91,7 +91,7 @@ using namespace ::android::hardware::audio::CPP_VERSION;
#if MAJOR_VERSION >= 7
// Make an alias for enumerations generated from the APM config XSD.
namespace xsd {
using namespace ::audio::policy::configuration::CPP_VERSION;
using namespace ::android::audio::policy::configuration::CPP_VERSION;
}
#endif

10
audio/effect/all-versions/vts/functional/VtsHalAudioEffectTargetTest.cpp
View File

@@ -28,8 +28,8 @@
#include <android/hidl/allocator/1.0/IAllocator.h>
#include <android/hidl/memory/1.0/IMemory.h>
#if MAJOR_VERSION >= 7
#include <audio_policy_configuration_V7_0-enums.h>
#include <audio_policy_configuration_V7_0.h>
#include <android_audio_policy_configuration_V7_0-enums.h>
#include <android_audio_policy_configuration_V7_0.h>
#endif
#include <common/all-versions/VersionUtils.h>
@@ -54,7 +54,7 @@ using namespace ::android::hardware::audio::effect::CPP_VERSION;
#if MAJOR_VERSION >= 7
// Make an alias for enumerations generated from the APM config XSD.
namespace xsd {
using namespace ::audio::policy::configuration::CPP_VERSION;
using namespace ::android::audio::policy::configuration::CPP_VERSION;
}
#endif
@@ -262,8 +262,8 @@ void AudioEffectHidlTest::getChannelCount(uint32_t* channelCount) {
*channelCount = audio_channel_count_from_out_mask(
static_cast<audio_channel_mask_t>(currentConfig.outputCfg.channels));
#else
*channelCount =
audio::policy::configuration::V7_0::getChannelCount(currentConfig.outputCfg.channels);
*channelCount = android::audio::policy::configuration::V7_0::getChannelCount(
currentConfig.outputCfg.channels);
ASSERT_NE(*channelCount, 0);
#endif
}