Revert "Fix entry lookup in getDurationMs"
This reverts commit 855a85393000b9800147a7a6aef2d2c8793c1b8f.
Reason for revert: Potential culprit for 335917937 - will rung abtd before submission.
Change-Id: I04a13838257005438c1eb79727f1a651b64705f4
diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/policy/AvalancheControllerTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/policy/AvalancheControllerTest.kt
index 7420ea0..29f286f 100644
--- a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/policy/AvalancheControllerTest.kt
+++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/policy/AvalancheControllerTest.kt
@@ -248,35 +248,6 @@
}
@Test
- fun testGetDurationMs_untrackedEntryEmptyAvalanche_useAutoDismissTime() {
- val givenEntry = createHeadsUpEntry(id = 0)
-
- // Nothing is showing
- mAvalancheController.headsUpEntryShowing = null
-
- // Nothing is next
- mAvalancheController.clearNext()
-
- val durationMs = mAvalancheController.getDurationMs(givenEntry, autoDismissMs = 5000)
- Truth.assertThat(durationMs).isEqualTo(5000)
- }
-
- @Test
- fun testGetDurationMs_untrackedEntryNonEmptyAvalanche_useAutoDismissTime() {
- val givenEntry = createHeadsUpEntry(id = 0)
-
- // Given entry not tracked
- mAvalancheController.headsUpEntryShowing = createHeadsUpEntry(id = 1)
-
- mAvalancheController.clearNext()
- val nextEntry = createHeadsUpEntry(id = 2)
- mAvalancheController.addToNext(nextEntry, runnableMock!!)
-
- val durationMs = mAvalancheController.getDurationMs(givenEntry, autoDismissMs = 5000)
- Truth.assertThat(durationMs).isEqualTo(5000)
- }
-
- @Test
fun testGetDurationMs_lastEntry_useAutoDismissTime() {
// Entry is showing
val showingEntry = createHeadsUpEntry(id = 0)
@@ -290,7 +261,7 @@
}
@Test
- fun testGetDurationMs_nextEntryLowerPriority_5000() {
+ fun testGetDurationMs_nextEntryLowerPriority_500() {
// Entry is showing
val showingEntry = createFsiHeadsUpEntry(id = 1)
mAvalancheController.headsUpEntryShowing = showingEntry
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/AvalancheController.kt b/packages/SystemUI/src/com/android/systemui/statusbar/policy/AvalancheController.kt
index 36c23d3..f573530 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/AvalancheController.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/AvalancheController.kt
@@ -153,45 +153,27 @@
// Use default duration, like we did before AvalancheController existed
return autoDismissMs
}
+
val showingList: MutableList<HeadsUpEntry> = mutableListOf()
- if (headsUpEntryShowing != null) {
- showingList.add(headsUpEntryShowing!!)
- }
+ headsUpEntryShowing?.let { showingList.add(it) }
+
nextList.sort()
val entryList = showingList + nextList
- if (entryList.isEmpty()) {
- log { "No avalanche HUNs, use default ms: $autoDismissMs" }
- return autoDismissMs
- }
- // entryList.indexOf(entry) returns -1 even when the entry is in entryList
- var thisEntryIndex = -1
- for ((i, e) in entryList.withIndex()) {
- if (e == entry) {
- thisEntryIndex = i
- }
- }
- if (thisEntryIndex == -1) {
- log { "Untracked entry, use default ms: $autoDismissMs" }
- return autoDismissMs
- }
+ val thisEntryIndex = entryList.indexOf(entry)
val nextEntryIndex = thisEntryIndex + 1
// If last entry, use default duration
if (nextEntryIndex >= entryList.size) {
- log { "Last entry, use default ms: $autoDismissMs" }
return autoDismissMs
}
val nextEntry = entryList[nextEntryIndex]
if (nextEntry.compareNonTimeFields(entry) == -1) {
// Next entry is higher priority
- log { "Next entry is higher priority: 500ms" }
return 500
} else if (nextEntry.compareNonTimeFields(entry) == 0) {
// Next entry is same priority
- log { "Next entry is same priority: 1000ms" }
return 1000
} else {
- log { "Next entry is lower priority, use default ms: $autoDismissMs" }
return autoDismissMs
}
}