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

Commit b9d59ad4 authored by Robert Luo's avatar Robert Luo Committed by Automerger Merge Worker
Browse files

Merge "Revert "Revert "Revert "Revert "Enable ADVANCED_VPN_ENABLED For... 

Merge "Revert "Revert "Revert "Revert "Enable ADVANCED_VPN_ENABLED For Droidfood""""" into udc-dev am: d1668371

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22574505



Change-Id: I0e6f613769a339fb949b224c3abb592157189c78
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5ea0c9b8 d1668371

packages/SystemUI/src/com/android/systemui/flags/Flags.kt

+2 −2
Original line number Diff line number Diff line
@@ -679,8 +679,8 @@ object Flags { 


    // TODO(b/272805037): Tracking Bug

    @JvmField

    val ADVANCED_VPN_ENABLED = unreleasedFlag(2800, name = "AdvancedVpn__enable_feature",

            namespace = "vpn", teamfood = true)

    val ADVANCED_VPN_ENABLED = releasedFlag(2800, name = "AdvancedVpn__enable_feature",

            namespace = "vpn")



    // TODO(b/278761837): Tracking Bug

    @JvmField