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

Merge "Ignore nonsensical clears from NoMan" into rvc-dev am: 191d081ba8

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

Change-Id: If504bf7fdfadb14493e8a1dd60442e839540da1f
This commit is contained in:
TreeHugger Robot
2020-06-29 17:14:30 +00:00
committed by Automerger Merge Worker
parent 2e53c54ab9 191d081ba8
commit d0f09fc39f
3 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotifCollection.java
View File

@@ -382,9 +382,8 @@ public class NotifCollection implements Dumpable {
final NotificationEntry entry = mNotificationSet.get(sbn.getKey()); final NotificationEntry entry = mNotificationSet.get(sbn.getKey());
if (entry == null) { if (entry == null) {
crashIfNotInitializing( // TODO (b/160008901): Throw an exception here
new IllegalStateException("No notification to remove with key " mLogger.logNoNotificationToRemoveWithKey(sbn.getKey());
+ sbn.getKey()));
return; return;
} }

8
packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/notifcollection/NotifCollectionLogger.kt
View File

@@ -121,6 +121,14 @@ class NotifCollectionLogger @Inject constructor(
}) })
} }
fun logNoNotificationToRemoveWithKey(key: String) {
buffer.log(TAG, ERROR, {
str1 = key
}, {
"No notification to remove with key $str1"
})
}
fun logRankingMissing(key: String, rankingMap: RankingMap) { fun logRankingMissing(key: String, rankingMap: RankingMap) {
buffer.log(TAG, WARNING, { str1 = key }, { "Ranking update is missing ranking for $str1" }) buffer.log(TAG, WARNING, { str1 = key }, { "Ranking update is missing ranking for $str1" })
buffer.log(TAG, DEBUG, {}, { "Ranking map contents:" }) buffer.log(TAG, DEBUG, {}, { "Ranking map contents:" })

7
packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/NotifCollectionTest.java
View File

@@ -1273,8 +1273,8 @@ public class NotifCollectionTest extends SysuiTestCase {
verify(mInterceptor3, never()).shouldInterceptDismissal(clearable); verify(mInterceptor3, never()).shouldInterceptDismissal(clearable);
} }
@Test(expected = IllegalStateException.class) @Test
public void testClearNotificationThrowsIfMissing() { public void testClearNotificationDoesntThrowIfMissing() {
// GIVEN that enough time has passed that we're beyond the forgiveness window // GIVEN that enough time has passed that we're beyond the forgiveness window
mClock.advanceTime(5001); mClock.advanceTime(5001);
@@ -1287,7 +1287,8 @@ public class NotifCollectionTest extends SysuiTestCase {
container.getSbn(), container.getSbn(),
new RankingMap(new Ranking[]{ container.getRanking() })); new RankingMap(new Ranking[]{ container.getRanking() }));
// THEN an exception is thrown // THEN the event is ignored
verify(mCollectionListener, never()).onEntryRemoved(any(NotificationEntry.class), anyInt());
} }
@Test @Test