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

Commit 2e333890 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "Fix flag app being empty." into tm-qpr-dev am: 59221c27 am: f4fea766"

parents 423afdd6 e5acd9db

packages/SystemUI/src-debug/com/android/systemui/flags/FlagsFactory.kt

+5 −1
Original line number Diff line number Diff line
@@ -22,7 +22,11 @@ object FlagsFactory { 
    private val flagMap = mutableMapOf<String, Flag<*>>()



    val knownFlags: Map<String, Flag<*>>

        get() = flagMap

        get() {

            // We need to access Flags in order to initialize our map.

            assert(flagMap.contains(Flags.TEAMFOOD.name)) { "Where is teamfood?" }

            return flagMap

        }



    fun unreleasedFlag(

        id: Int,

packages/SystemUI/src-release/com/android/systemui/flags/FlagsFactory.kt

+5 −1
Original line number Diff line number Diff line
@@ -22,7 +22,11 @@ object FlagsFactory { 
    private val flagMap = mutableMapOf<String, Flag<*>>()



    val knownFlags: Map<String, Flag<*>>

        get() = flagMap

        get() {

            // We need to access Flags in order to initialize our map.

            assert(flagMap.contains(Flags.TEAMFOOD.name)) { "Where is teamfood?" }

            return flagMap

        }



    fun unreleasedFlag(

        id: Int,