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

Commit 27ecdb18 authored Oct 23, 2022 by Chandru Committed by Automerger Merge Worker Oct 23, 2022

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

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

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

Change-Id: If3ff4f5a6be87defad807180cfe14341e7e27965
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents ec35f89d afe3261e

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("")
			}
	}		}