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

Commit d0f09fc3 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: If504bf7fdfadb14493e8a1dd60442e839540da1f
parents 2e53c54a 191d081b

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

+2 −3
Original line number Original line Diff line number Diff line
@@ -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;

        }

        }

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

+8 −0
Original line number Original line Diff line number Diff line
@@ -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:" })

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

+4 −3
Original line number Original line Diff line number Diff line
@@ -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