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

Commit 2d106143 authored by Oriol Prieto Gasco's avatar Oriol Prieto Gasco Committed by Oriol Prieto Gascó
Browse files

RESTRICT AUTOMERGE 

Set the container field of aconfig flags

Test: printflags --format='{package}:{container}:' | grep "::"
Bug: 312769710
Flag: NONE
Change-Id: Id6551921f21adb680379f539f03ed15e72aab41f
parent f9b4cd3d

camera/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ license { 
aconfig_declarations {

    name: "camera_platform_flags",

    package: "com.android.internal.camera.flags",

    container: "system",

    srcs: ["camera_platform.aconfig"],

}

camera/camera_platform.aconfig

+1 −0
Original line number Diff line number Diff line 
package: "com.android.internal.camera.flags"

container: "system"



flag {

     namespace: "camera_platform"

media/audio/aconfig/Android.bp

+6 −0
Original line number Diff line number Diff line
@@ -8,18 +8,21 @@ cc_defaults { 
aconfig_declarations {

    name: "com.android.media.audioserver-aconfig",

    package: "com.android.media.audioserver",

    container: "system",

    srcs: ["audioserver.aconfig"],

}



aconfig_declarations {

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

    package: "com.android.media.audio",

    container: "system",

    srcs: ["audio.aconfig"],

}



aconfig_declarations {

    name: "com.android.media.aaudio-aconfig",

    package: "com.android.media.aaudio",

    container: "system",

    srcs: ["aaudio.aconfig"],

}
@@ -63,6 +66,7 @@ java_aconfig_library { 
aconfig_declarations {

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

    package: "android.media.audio",

    container: "system",

    srcs: ["audio_framework.aconfig"],

    visibility: ["//visibility:private"],

}
@@ -70,6 +74,7 @@ aconfig_declarations { 
aconfig_declarations {

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

    package: "android.media.audiopolicy",

    container: "system",

    srcs: ["audiopolicy_framework.aconfig"],

    visibility: ["//visibility:private"],

}
@@ -77,6 +82,7 @@ aconfig_declarations { 
aconfig_declarations {

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

    package: "android.media.midi",

    container: "system",

    srcs: ["midi_flags.aconfig"],

    visibility: ["//visibility:private"],

}

media/audio/aconfig/aaudio.aconfig

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
# Please add flags in alphabetical order.



package: "com.android.media.aaudio"

container: "system"



flag {

    name: "sample_rate_conversion"

media/audio/aconfig/audio.aconfig

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
# Please add flags in alphabetical order.



package: "com.android.media.audio"

container: "system"



flag {

    name: "alarm_min_volume_zero"