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

Commit 9303e15d authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Changing package for audio_policy_configuration_V7_0" am: a1736399 am: b5cb89cf 

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

Change-Id: I2c614a01626aca0e167b5092705d8c0cdc6db9aa
parents ad31d882 b5cb89cf

audio/7.0/config/Android.bp

+2 −1
Original line number Diff line number Diff line 
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,

}

audio/7.0/config/api/current.txt

+439 −439

File changed.

Preview size limit exceeded, changes collapsed.

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

+6 −6
Original line number Diff line number Diff line
@@ -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

audio/common/7.0/example/Effect.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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 {

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

+4 −4
Original line number Diff line number Diff line
@@ -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) {