Merge "Don't require unlock to dismiss a media control" into sc-dev

2 files changed, 4 insertions, 16 deletions

diff --git a/packages/SystemUI/src/com/android/systemui/media/MediaControlPanel.java b/packages/SystemUI/src/com/android/systemui/media/MediaControlPanel.java
index 8532a46f0fc5..27a4e93db4ad 100644
--- a/packages/SystemUI/src/com/android/systemui/media/MediaControlPanel.java
+++ b/packages/SystemUI/src/com/android/systemui/media/MediaControlPanel.java
@@ -447,11 +447,8 @@ public class MediaControlPanel {
 
             if (mKey != null) {
                 closeGuts();
-                mKeyguardDismissUtil.executeWhenUnlocked(() -> {
-                    mMediaDataManagerLazy.get().dismissMediaData(mKey,
-                            MediaViewController.GUTS_ANIMATION_DURATION + 100);
-                    return true;
-                }, /* requiresShadeOpen */ true, false);
+                mMediaDataManagerLazy.get().dismissMediaData(mKey,
+                        MediaViewController.GUTS_ANIMATION_DURATION + 100);
             } else {
                 Log.w(TAG, "Dismiss media with null notification. Token uid="
                         + data.getToken().getUid());
@@ -576,11 +573,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);
+            mMediaDataManagerLazy.get().dismissSmartspaceRecommendation(
+                    MediaViewController.GUTS_ANIMATION_DURATION + 100L);
         });
 
         mController = null;
diff --git a/packages/SystemUI/tests/src/com/android/systemui/media/MediaControlPanelTest.kt b/packages/SystemUI/tests/src/com/android/systemui/media/MediaControlPanelTest.kt
index d6b82f355e7c..2d19f7dd4706 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/media/MediaControlPanelTest.kt
+++ b/packages/SystemUI/tests/src/com/android/systemui/media/MediaControlPanelTest.kt
@@ -55,7 +55,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
@@ -329,11 +328,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())
     }