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

Commit 98905262 authored by Presubmit Automerger Backend's avatar Presubmit Automerger Backend
Browse files

[automerge] Duplicate call of logTapAction from merge 2p: 7985b4ab 

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

Change-Id: Icce1ad8242c29fd02aee8ecdb2cde6e7a8564966
parents 10c3a906 7985b4ab

packages/SystemUI/src/com/android/systemui/media/MediaControlPanel.java

+0 −1
Original line number Diff line number Diff line
@@ -680,7 +680,6 @@ public class MediaControlPanel { 
                    button.setEnabled(true);

                    button.setOnClickListener(v -> {

                        if (!mFalsingManager.isFalseTap(FalsingManager.LOW_PENALTY)) {

                            mLogger.logTapAction(button.getId(), mUid, mPackageName, mInstanceId);

                            mLogger.logTapAction(button.getId(), mUid, mPackageName, mInstanceId);

                            logSmartspaceCardReported(SMARTSPACE_CARD_CLICK_EVENT);

                            action.run();

packages/SystemUI/tests/src/com/android/systemui/media/MediaControlPanelTest.kt

+5 −0
Original line number Diff line number Diff line
@@ -105,6 +105,7 @@ public class MediaControlPanelTest : SysuiTestCase() { 
    @Mock private lateinit var mediaOutputDialogFactory: MediaOutputDialogFactory

    @Mock private lateinit var mediaCarouselController: MediaCarouselController

    @Mock private lateinit var falsingManager: FalsingManager

    @Mock private lateinit var transitionParent: ViewGroup

    private lateinit var appIcon: ImageView

    private lateinit var albumView: ImageView

    private lateinit var titleText: TextView
@@ -242,6 +243,10 @@ public class MediaControlPanelTest : SysuiTestCase() { 
        whenever(viewHolder.seamlessText).thenReturn(seamlessText)

        whenever(viewHolder.seekBar).thenReturn(seekBar)



        // Transition View

        whenever(view.parent).thenReturn(transitionParent)

        whenever(view.rootView).thenReturn(transitionParent)



        // Action buttons

        whenever(viewHolder.actionPlayPause).thenReturn(actionPlayPause)

        whenever(viewHolder.getAction(R.id.actionPlayPause)).thenReturn(actionPlayPause)