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

Commit af54da54 authored by Marcello Galhardo's avatar Marcello Galhardo
Browse files

Fix "Flip "track_stylus_ever_used" feature flag to unreleased" conflict 

Fix ag/21464108 conflict for flipping the flag from `releasedFlag` back to `unreleasedFlag`.

Test: manual

Fixes: b/269614190
Change-Id: I44d8ece8ff8b96a0c1630250af4d8b80a2d54940
parent b53592ec

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

+1 −2
Original line number Diff line number Diff line
@@ -588,8 +588,7 @@ object Flags { 
    @JvmField val UDFPS_ELLIPSE_DETECTION = releasedFlag(2201, "udfps_ellipse_detection")



    // 2300 - stylus

    @JvmField

    val TRACK_STYLUS_EVER_USED = unreleasedFlag(2300, "track_stylus_ever_used", teamfood = true)

    @JvmField val TRACK_STYLUS_EVER_USED = releasedFlag(2300, "track_stylus_ever_used")

    @JvmField

    val ENABLE_STYLUS_CHARGING_UI =

        unreleasedFlag(2301, "enable_stylus_charging_ui", teamfood = true)