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

Commit 70cc099f authored by Ziyang Cheng's avatar Ziyang Cheng Committed by Android (Google) Code Review
Browse files

Merge "Add sound_trigger_generic_model_api flag." into main

parents fc480122 39ceb6de

media/audio/aconfig/Android.bp

+14 −0
Original line number Diff line number Diff line
@@ -118,6 +118,13 @@ aconfig_declarations { 
    visibility: ["//frameworks/base/api"],

}



aconfig_declarations {

    name: "android.media.soundtrigger-aconfig",

    package: "android.media.soundtrigger",

    container: "system",

    srcs: ["soundtrigger.aconfig"],

}



java_aconfig_library {

    name: "android.media.audio-aconfig-java",

    aconfig_declarations: "android.media.audio-aconfig",
@@ -141,6 +148,12 @@ java_aconfig_library { 
    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



java_aconfig_library {

    name: "android.media.soundtrigger-aconfig-java",

    aconfig_declarations: "android.media.soundtrigger-aconfig",

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



cc_aconfig_library {

    name: "android.media.audiopolicy-aconfig-cc",

    aconfig_declarations: "android.media.audiopolicy-aconfig",
@@ -153,5 +166,6 @@ aconfig_declarations_group { 
        "android.media.audio-aconfig-java",

        "android.media.audiopolicy-aconfig-java",

        "android.media.midi-aconfig-java",

        "android.media.soundtrigger-aconfig-java",

    ],

}

media/audio/aconfig/soundtrigger.aconfig

0 → 100644
+14 −0
Original line number Diff line number Diff line 
# Flags for sound trigger

#

# Please add flags in alphabetical order.



package: "android.media.soundtrigger"

container: "system"



flag {

    name: "sound_trigger_generic_model_api"

    is_exported: true

    namespace: "soundtrigger"

    description: "Feature flag for adding GenericSoundModel to SystemApi"

    bug: "339267254"

}