diff options
2 files changed, 7 insertions, 4 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationActivityStarter.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationActivityStarter.java index acca953629c7..6a0ebf7b5767 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationActivityStarter.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationActivityStarter.java @@ -378,8 +378,8 @@ public class StatusBarNotificationActivityStarter implements NotificationActivit // We have to post the removal to the UI thread for synchronization. mMainThreadHandler.post(() -> { final Runnable removeNotification = () -> { - mOnUserInteractionCallback.onDismiss(entry, REASON_CLICK); mClickNotifier.onNotificationClick(entry.getKey(), nv); + mOnUserInteractionCallback.onDismiss(entry, REASON_CLICK); }; if (mPresenter.isCollapsing()) { // To avoid lags we're only performing the remove diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarNotificationActivityStarterTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarNotificationActivityStarterTest.java index 1f31fcd2a2bf..52b7b022bc8a 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarNotificationActivityStarterTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarNotificationActivityStarterTest.java @@ -81,7 +81,9 @@ import com.android.systemui.wmshell.BubblesManager; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.mockito.InOrder; import org.mockito.Mock; +import org.mockito.Mockito; import org.mockito.MockitoAnnotations; import org.mockito.stubbing.Answer; @@ -261,11 +263,12 @@ public class StatusBarNotificationActivityStarterTest extends SysuiTestCase { verify(mAssistManager).hideAssist(); - verify(mClickNotifier).onNotificationClick( + InOrder orderVerifier = Mockito.inOrder(mClickNotifier, mOnUserInteractionCallback); + orderVerifier.verify(mClickNotifier).onNotificationClick( eq(sbn.getKey()), any(NotificationVisibility.class)); - // Notification calls dismiss callback to remove notification due to FLAG_AUTO_CANCEL - verify(mOnUserInteractionCallback).onDismiss(mNotificationRow.getEntry(), REASON_CLICK); + orderVerifier.verify(mOnUserInteractionCallback).onDismiss(mNotificationRow.getEntry(), + REASON_CLICK); } @Test |