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

Merge changes from topic "fix-b-142480271-xml-deserializer"

Browse Source 
* changes:
  audio: Fix SourceMetadata spec in HAL V7 VTS
  Default Audio HAL service: add V7, remove V2
  audio: Update audioPolicyConfiguration version
This commit is contained in:
Treehugger Robot
2021-02-05 22:17:08 +00:00
committed by Gerrit Code Review
parent fb3fa529b2 c32b8584e9
commit a3b2ea24c4
5 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -544,7 +544,7 @@ package android.audio.policy.configuration.V7_0 {
public enum Version {
method @NonNull public String getRawName();
enum_constant public static final android.audio.policy.configuration.V7_0.Version _1_0;
enum_constant public static final android.audio.policy.configuration.V7_0.Version _7_0;
}
public class Volume {

2
audio/7.0/config/audio_policy_configuration.xsd
View File

@@ -20,7 +20,7 @@
<!-- List the config versions supported by audio policy. -->
<xs:simpleType name="version">
<xs:restriction base="xs:decimal">
<xs:enumeration value="1.0"/>
<xs:enumeration value="7.0"/>
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="halVersion">

3
audio/7.0/config/update_audio_policy_config.sh
View File

@@ -113,6 +113,9 @@ echo "Will update paths to shared included files."
echo "Press Ctrl-C to cancel, Enter to continue"
read
# Update 'audioPolicyConfiguration version="1.0"' -> 7.0 in the main file
sed -i -r -e 's/(audioPolicyConfiguration version=")1.0/\17.0/' ${SOURCE_CONFIG}
updateFile() {
FILE=$1
ATTR=$2

4
audio/common/all-versions/default/service/service.cpp
View File

@@ -63,17 +63,17 @@ int main(int /* argc */, char* /* argv */ []) {
const std::vector<InterfacesList> mandatoryInterfaces = {
{
"Audio Core API",
"android.hardware.audio@7.0::IDevicesFactory",
"android.hardware.audio@6.0::IDevicesFactory",
"android.hardware.audio@5.0::IDevicesFactory",
"android.hardware.audio@4.0::IDevicesFactory",
"android.hardware.audio@2.0::IDevicesFactory"
},
{
"Audio Effect API",
"android.hardware.audio.effect@7.0::IEffectsFactory",
"android.hardware.audio.effect@6.0::IEffectsFactory",
"android.hardware.audio.effect@5.0::IEffectsFactory",
"android.hardware.audio.effect@4.0::IEffectsFactory",
"android.hardware.audio.effect@2.0::IEffectsFactory",
}
};

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

@@ -928,9 +928,9 @@ class OutputStreamTest : public OpenStreamTest<IStreamOut> {
const SourceMetadata initMetadata = {
{ { toString(xsd::AudioUsage::AUDIO_USAGE_MEDIA),
toString(xsd::AudioContentType::AUDIO_CONTENT_TYPE_MUSIC),
{},
1 /* gain */,
toString(xsd::AudioChannelMask::AUDIO_CHANNEL_OUT_STEREO),
1 /* gain */ } }};
{} } }};
#endif
};
TEST_P(OutputStreamTest, OpenOutputStreamTest) {