Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I3b35c1c3fb66f891ef3f34aebcf43ee00fd7d279
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Chandru
2022-10-23 14:13:06 +00:00
committed by Automerger Merge Worker
parent 76119b23ae 08241b1e6a
commit afe3261ed6
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/keyguard/BouncerKeyguardMessageArea.kt
View File

@@ -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

9
packages/SystemUI/tests/src/com/android/keyguard/BouncerKeyguardMessageAreaTest.kt
View File

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