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

Commit 3828df83 authored by Oriol Prieto Gasco's avatar Oriol Prieto Gasco Committed by Automerger Merge Worker
Browse files

RESTRICT AUTOMERGE am: ba93d59f 

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/3068622



Change-Id: Ie20d3d6e37f43f6944d20b57bbe8536fae6cba6a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cc318984 ba93d59f

flags/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ package { 
aconfig_declarations {

    name: "telephony_flags",

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

    container: "system",

    srcs: [

      "data.aconfig",

      "domainselection.aconfig",

flags/data.aconfig

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

container: "system"



flag {

  name: "auto_switch_allow_roaming"

flags/domainselection.aconfig

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

container: "system"



flag {

    name: "ap_domain_selection_enabled"

flags/ims.aconfig

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

container: "system"



flag {

    name: "conference_hold_unhold_changed_to_send_message"

flags/iwlan.aconfig

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

container: "system"



flag {

    name: "enable_aead_algorithms"