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

Commit f4fea766 authored by Dave Mankoff's avatar Dave Mankoff Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I249cc62431447b968e939bbbd8ad2a47460f4e2f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bf8cc1b7 59221c27

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,