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

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

Merge "[Ongoing Call] Remove the call chip when #onEntryCleanUp is called."... 

Merge "[Ongoing Call] Remove the call chip when #onEntryCleanUp is called." into sc-v2-dev am: 8649b294 am: 42df1ac1

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

Change-Id: I0f4ec2f3535d765bb77696cd3035e15110c3dd8a
parents 95a63d67 42df1ac1

packages/SystemUI/src/com/android/systemui/statusbar/phone/ongoingcall/OngoingCallController.kt

+9 −0
Original line number Original line Diff line number Diff line
@@ -103,7 +103,16 @@ class OngoingCallController @Inject constructor( 
            }

            }

        }

        }





        // Fix for b/199600334

        override fun onEntryCleanUp(entry: NotificationEntry) {

            removeChipIfNeeded(entry)

        }



        override fun onEntryRemoved(entry: NotificationEntry, reason: Int) {

        override fun onEntryRemoved(entry: NotificationEntry, reason: Int) {

            removeChipIfNeeded(entry)

        }



        private fun removeChipIfNeeded(entry: NotificationEntry) {

            if (entry.sbn.key == callNotificationInfo?.key) {

            if (entry.sbn.key == callNotificationInfo?.key) {

                removeChip()

                removeChip()

            }

            }

packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ongoingcall/OngoingCallControllerTest.kt

+12 −0
Original line number Original line Diff line number Diff line
@@ -221,6 +221,18 @@ class OngoingCallControllerTest : SysuiTestCase() { 
        verify(mockOngoingCallListener).onOngoingCallStateChanged(anyBoolean())

        verify(mockOngoingCallListener).onOngoingCallStateChanged(anyBoolean())

    }

    }





    /** Regression test for b/201097913. */

    @Test

    fun onEntryCleanUp_callNotifAddedThenRemoved_listenerNotified() {

        val ongoingCallNotifEntry = createOngoingCallNotifEntry()

        notifCollectionListener.onEntryAdded(ongoingCallNotifEntry)

        reset(mockOngoingCallListener)



        notifCollectionListener.onEntryCleanUp(ongoingCallNotifEntry)



        verify(mockOngoingCallListener).onOngoingCallStateChanged(anyBoolean())

    }



    /** Regression test for b/188491504. */

    /** Regression test for b/188491504. */

    @Test

    @Test

    fun onEntryRemoved_removedNotifHasSameKeyAsAddedNotif_listenerNotified() {

    fun onEntryRemoved_removedNotifHasSameKeyAsAddedNotif_listenerNotified() {