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

Commit afe3261e authored by Chandru's avatar Chandru Committed by Automerger Merge Worker
Browse files

BouncerKeyguardMessage doesn't always get cleared when being set to null. am: 08241b1e 

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



Change-Id: I3b35c1c3fb66f891ef3f34aebcf43ee00fd7d279
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 76119b23 08241b1e

packages/SystemUI/src/com/android/keyguard/BouncerKeyguardMessageArea.kt

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ open class BouncerKeyguardMessageArea(context: Context?, attrs: AttributeSet?) : 
    }



    override fun setMessage(msg: CharSequence?) {

        if (msg == textAboutToShow || msg == text) {

        if ((msg == textAboutToShow && msg != null) || msg == text) {

            return

        }

        textAboutToShow = msg

packages/SystemUI/tests/src/com/android/keyguard/BouncerKeyguardMessageAreaTest.kt

+9 −0
Original line number Diff line number Diff line
@@ -66,4 +66,13 @@ class BouncerKeyguardMessageAreaTest : SysuiTestCase() { 
        underTest.setMessage(null)

        assertThat(underTest.text).isEqualTo("")

    }



    @Test

    fun testSetNullClearsPreviousMessage() {

        underTest.setMessage("something not null")

        assertThat(underTest.text).isEqualTo("something not null")



        underTest.setMessage(null)

        assertThat(underTest.text).isEqualTo("")

    }

}