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

Commit 08241b1e authored Oct 20, 2022 by Chandru Committed by Chandru S Oct 23, 2022

BouncerKeyguardMessage doesn't always get cleared when being set to null.

Hypothesis: textAboutToShow == msg check can potentially skip such invocations.

Bug: 249475000
Test: atest BouncerKeyguardMessageAreaTest

Change-Id: I5d198c0e693fd96c9ad5d5528452206bf871eccc

parent 1b454303

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

+1 −1

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

	override fun setMessage(msg: CharSequence?) {		override fun setMessage(msg: CharSequence?) {
	if (msg == textAboutToShow \|\| msg == text) {		if ((msg == textAboutToShow && msg != null) \|\| msg == text) {
	return		return
	}		}
	textAboutToShow = msg		textAboutToShow = msg

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

+9 −0

Original line number	Original line	Diff line number	Diff line
	@@ -66,4 +66,13 @@ class BouncerKeyguardMessageAreaTest : SysuiTestCase() {
	underTest.setMessage(null)		underTest.setMessage(null)
	assertThat(underTest.text).isEqualTo("")		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("")
			}
	}		}