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

Commit 13ee768f authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Revert "Enable LOCKSCREEN_WITHOUT_SECURE_LOCK_WHEN_DREAMING for... 

Merge "Revert "Enable LOCKSCREEN_WITHOUT_SECURE_LOCK_WHEN_DREAMING for teamfood"" into udc-dev am: 4eeba994 am: fc173e02

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



Change-Id: Ie5eff9d6ba900265603ceb88a907ff438e1616e2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c2ee3255 fc173e02

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

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ object Flags { 


    // TODO(b/275694445): Tracking Bug

    @JvmField

    val LOCKSCREEN_WITHOUT_SECURE_LOCK_WHEN_DREAMING = releasedFlag(208,

    val LOCKSCREEN_WITHOUT_SECURE_LOCK_WHEN_DREAMING = unreleasedFlag(208,

        "lockscreen_without_secure_lock_when_dreaming")



    /**