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

Commit 354b21ec authored by Beth Thibodeau's avatar Beth Thibodeau
Browse files

Remove media_controls_user_initiated_deleteintent flag 

Test: atest NotificationMediaManagerTest
Flag: EXEMPT clean up launched flag
Fixes: 409607921
Change-Id: I10df4e98a6e38922aebfe4937c53c3798ad40335
parent f804d003

packages/SystemUI/aconfig/systemui.aconfig

+0 −10
Original line number Diff line number Diff line
@@ -1374,16 +1374,6 @@ flag { 
  }

}



flag {

  name: "media_controls_user_initiated_deleteintent"

  namespace: "systemui"

  description: "Only dismiss media notifications when the control was removed by the user."

  bug: "335875159"

  metadata {

    purpose: PURPOSE_BUGFIX

  }

}



flag {

  name: "media_controls_lockscreen_shade_bug_fix"

  namespace: "systemui"

packages/SystemUI/multivalentTests/src/com/android/systemui/media/NotificationMediaManagerTest.kt

+0 −20
Original line number Diff line number Diff line
@@ -20,12 +20,9 @@ import android.media.MediaMetadata 
import android.media.session.MediaController

import android.media.session.MediaSession

import android.os.fakeExecutorHandler

import android.platform.test.annotations.DisableFlags

import android.platform.test.annotations.EnableFlags

import android.service.notification.NotificationListenerService

import androidx.test.ext.junit.runners.AndroidJUnit4

import androidx.test.filters.SmallTest

import com.android.systemui.Flags

import com.android.systemui.SysuiTestCase

import com.android.systemui.dump.dumpManager

import com.android.systemui.media.controls.domain.pipeline.MediaDataManager
@@ -87,7 +84,6 @@ class NotificationMediaManagerTest : SysuiTestCase() { 
    }



    @Test

    @EnableFlags(Flags.FLAG_MEDIA_CONTROLS_USER_INITIATED_DELETEINTENT)

    fun mediaDataRemoved_userInitiated_dismissNotif() {

        val notifEntryCaptor = argumentCaptor<NotificationEntry>()

        val notifEntry = mock<NotificationEntry>()
@@ -102,28 +98,12 @@ class NotificationMediaManagerTest : SysuiTestCase() { 
    }



    @Test

    @EnableFlags(Flags.FLAG_MEDIA_CONTROLS_USER_INITIATED_DELETEINTENT)

    fun mediaDataRemoved_notUserInitiated_doesNotDismissNotif() {

        listenerCaptor.lastValue.onMediaDataRemoved(KEY, false)



        verify(notifCollection, never()).dismissNotification(any(), any())

    }



    @Test

    @DisableFlags(Flags.FLAG_MEDIA_CONTROLS_USER_INITIATED_DELETEINTENT)

    fun mediaDataRemoved_notUserInitiated_flagOff_dismissNotif() {

        val notifEntryCaptor = argumentCaptor<NotificationEntry>()

        val notifEntry = mock<NotificationEntry>()

        whenever(notifEntry.key).thenReturn(KEY)

        whenever(notifEntry.ranking).thenReturn(NotificationListenerService.Ranking())

        whenever(notifPipeline.allNotifs).thenReturn(listOf(notifEntry))



        listenerCaptor.lastValue.onMediaDataRemoved(KEY, false)



        verify(notifCollection).dismissNotification(notifEntryCaptor.capture(), any())

        assertThat(notifEntryCaptor.lastValue.key).isEqualTo(KEY)

    }



    @Test

    fun clearMediaNotification_resetMediaMetadata() {

        // set up media metadata.

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

+1 −3
Original line number Diff line number Diff line
@@ -15,8 +15,6 @@ 
 */

package com.android.systemui.media;



import static com.android.systemui.Flags.mediaControlsUserInitiatedDeleteintent;



import android.annotation.NonNull;

import android.annotation.Nullable;

import android.app.Notification;
@@ -188,7 +186,7 @@ public class NotificationMediaManager implements Dumpable { 


            @Override

            public void onMediaDataRemoved(@NonNull String key, boolean userInitiated) {

                if (mediaControlsUserInitiatedDeleteintent() && !userInitiated) {

                if (!userInitiated) {

                    // Dismissing the notification will send the app's deleteIntent, so ignore if

                    // this was an automatic removal

                    Log.d(TAG, "Not dismissing " + key + " because it was removed by the system");