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

Commit cd189544 authored by Sam Dubey's avatar Sam Dubey Committed by Automerger Merge Worker
Browse files

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

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

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



Change-Id: I3348c279a3991b77d89664de99e8676684932821
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 11f5e248 29491469

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

+2 −2
Original line number Diff line number Diff line
@@ -708,6 +708,6 @@ object Flags { 


    // TODO(b/272805037): Tracking Bug

    @JvmField

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

            namespace = "vpn")

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

            namespace = "vpn", teamfood = true)

}