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

Commit e197e26b authored by Julia Reynolds's avatar Julia Reynolds
Browse files

Clean up flag notification_reentrant_dismiss 

Fixes: 409607420
Flag: EXEMPT flag cleanup
Test: ExpandableNotificationRowTest
Change-Id: Ib7cb7114500f174c663abc5334e40876bf508dd7
parent b3c8d3ba

packages/SystemUI/aconfig/systemui.aconfig

+0 −10
Original line number Diff line number Diff line
@@ -1844,16 +1844,6 @@ flag { 
    bug: "365064144"

}



flag {

    name: "notification_reentrant_dismiss"

    namespace: "systemui"

    description: "Posts to avoid a crashing reentrant pipeline run"

    bug: "328328054"

    metadata {

        purpose: PURPOSE_BUGFIX

      }

}



flag {

    name: "keyguard_transition_force_finish_on_screen_off"

    namespace: "systemui"

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java

+2 −8
Original line number Diff line number Diff line
@@ -1963,15 +1963,9 @@ public class ExpandableNotificationRow extends ActivatableNotificationView 
                        mOnUserInteractionCallback, REASON_CANCEL)

                        : mOnUserInteractionCallback.registerFutureDismissal(

                                getEntryLegacy(), REASON_CANCEL);

                if (Flags.notificationReentrantDismiss()) {

                if (futureDismissal != null) {

                    post(futureDismissal);

                }

                } else {

                    if (futureDismissal != null) {

                        futureDismissal.run();

                    }

                }

            }

        }

    }

packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRowTest.java

+0 −12
Original line number Diff line number Diff line
@@ -617,18 +617,6 @@ public class ExpandableNotificationRowTest extends SysuiTestCase { 
    }



    @Test

    @DisableFlags(com.android.systemui.Flags.FLAG_NOTIFICATION_REENTRANT_DISMISS)

    public void testCanDismiss_immediately() throws Exception {

        ExpandableNotificationRow row = mKosmos.createRow();

        when(mKosmos.getMockNotificationDismissibilityProvider().isDismissable(

                row.getKey()))

                .thenReturn(true);

        row.performDismiss(false);

        verify(mKosmos.getMockNotifCollection()).registerFutureDismissal(any(), anyInt(), any());

    }



    @Test

    @EnableFlags(com.android.systemui.Flags.FLAG_NOTIFICATION_REENTRANT_DISMISS)

    public void testCanDismiss() throws Exception {

        ExpandableNotificationRow row = mKosmos.createRow();

        when(mKosmos.getMockNotificationDismissibilityProvider().isDismissable(