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

Commit acc34e6c authored by Beth Thibodeau's avatar Beth Thibodeau
Browse files

Don't require unlock to dismiss a media control 

Fixes: 188552961
Test: manual
Test: atest MediaControlPanelTest

Change-Id: I087a2db226d68b59f30a6e10bc877f3536c77290
parent 0859a5f4

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

+4 −10
Original line number Diff line number Diff line
@@ -446,11 +446,8 @@ public class MediaControlPanel { 


            if (mKey != null) {

                closeGuts();

                mKeyguardDismissUtil.executeWhenUnlocked(() -> {

                mMediaDataManagerLazy.get().dismissMediaData(mKey,

                        MediaViewController.GUTS_ANIMATION_DURATION + 100);

                    return true;

                }, /* requiresShadeOpen */ true, false);

            } else {

                Log.w(TAG, "Dismiss media with null notification. Token uid="

                        + data.getToken().getUid());
@@ -575,11 +572,8 @@ public class MediaControlPanel { 
            logSmartspaceCardReported(761, // SMARTSPACE_CARD_DISMISS

                    /* isRecommendationCard */ true);

            closeGuts();

            mKeyguardDismissUtil.executeWhenUnlocked(() -> {

            mMediaDataManagerLazy.get().dismissSmartspaceRecommendation(

                    MediaViewController.GUTS_ANIMATION_DURATION + 100L);

                return true;

            }, true /* requiresShadeOpen */, false);

        });



        mController = null;

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

+0 −6
Original line number Diff line number Diff line
@@ -54,7 +54,6 @@ import org.junit.runner.RunWith 
import org.mockito.ArgumentCaptor

import org.mockito.ArgumentMatchers.anyLong

import org.mockito.Mock

import org.mockito.Mockito.anyBoolean

import org.mockito.Mockito.mock

import org.mockito.Mockito.never

import org.mockito.Mockito.verify
@@ -324,11 +323,6 @@ public class MediaControlPanelTest : SysuiTestCase() { 


        assertThat(dismiss.isEnabled).isEqualTo(true)

        dismiss.callOnClick()

        val captor = ArgumentCaptor.forClass(ActivityStarter.OnDismissAction::class.java)

        verify(keyguardDismissUtil).executeWhenUnlocked(captor.capture(), anyBoolean(),

            eq(false))



        captor.value.onDismiss()

        verify(mediaDataManager).dismissMediaData(eq(mediaKey), anyLong())

    }