Merge "Move media filtering from NVHM to NotificationFilter" into rvc-dev am: 2b29f91c46 (648ebb49) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/NotificationViewHierarchyManager.java

+0 −3

Original line number	Diff line number	Diff line
		@@ -42,7 +42,6 @@ import com.android.systemui.statusbar.notification.stack.NotificationListContain
		import com.android.systemui.statusbar.phone.KeyguardBypassController;
		import com.android.systemui.statusbar.phone.NotificationGroupManager;
		import com.android.systemui.util.Assert;
		import com.android.systemui.util.Utils;

		import java.util.ArrayList;
		import java.util.HashMap;
		@@ -150,9 +149,7 @@ public class NotificationViewHierarchyManager implements DynamicPrivacyControlle
		final int N = activeNotifications.size();
		for (int i = 0; i < N; i++) {
		NotificationEntry ent = activeNotifications.get(i);
		boolean hideMedia = Utils.useQsMediaPlayer(mContext);
		if (ent.isRowDismissed() \|\| ent.isRowRemoved()
		\|\| (ent.isMediaNotification() && hideMedia)
		\|\| mBubbleController.isBubbleNotificationSuppressedFromShade(ent)
		\|\| mFgsSectionController.hasEntry(ent)) {
		// we don't want to update removed notifications because they could

packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationFilter.java

+12 −1

Original line number	Diff line number	Diff line
		@@ -16,6 +16,8 @@

		package com.android.systemui.statusbar.notification;

		import static com.android.systemui.media.MediaDataManagerKt.isMediaNotification;

		import android.Manifest;
		import android.app.AppGlobals;
		import android.app.Notification;
		@@ -27,6 +29,7 @@ import android.service.notification.StatusBarNotification;
		import com.android.internal.annotations.VisibleForTesting;
		import com.android.systemui.Dependency;
		import com.android.systemui.ForegroundServiceController;
		import com.android.systemui.media.MediaFeatureFlag;
		import com.android.systemui.plugins.statusbar.StatusBarStateController;
		import com.android.systemui.statusbar.NotificationLockscreenUserManager;
		import com.android.systemui.statusbar.notification.collection.NotificationEntry;
		@@ -46,6 +49,7 @@ public class NotificationFilter {
		private final NotificationGroupManager mGroupManager = Dependency.get(
		NotificationGroupManager.class);
		private final StatusBarStateController mStatusBarStateController;
		private final Boolean mIsMediaFlagEnabled;

		private NotificationEntryManager.KeyguardEnvironment mEnvironment;
		private ShadeController mShadeController;
		@@ -53,8 +57,11 @@ public class NotificationFilter {
		private NotificationLockscreenUserManager mUserManager;

		@Inject
		public NotificationFilter(StatusBarStateController statusBarStateController) {
		public NotificationFilter(
		StatusBarStateController statusBarStateController,
		MediaFeatureFlag mediaFeatureFlag) {
		mStatusBarStateController = statusBarStateController;
		mIsMediaFlagEnabled = mediaFeatureFlag.getEnabled();
		}

		private NotificationEntryManager.KeyguardEnvironment getEnvironment() {
		@@ -133,6 +140,10 @@ public class NotificationFilter {
		}
		}
		}

		if (mIsMediaFlagEnabled && isMediaNotification(sbn)) {
		return true;
		}
		return false;
		}

packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/MediaCoordinator.java

0 → 100644

+52 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2020 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.systemui.statusbar.notification.collection.coordinator;

		import static com.android.systemui.media.MediaDataManagerKt.isMediaNotification;

		import com.android.systemui.media.MediaFeatureFlag;
		import com.android.systemui.statusbar.notification.collection.NotifPipeline;
		import com.android.systemui.statusbar.notification.collection.NotificationEntry;
		import com.android.systemui.statusbar.notification.collection.listbuilder.pluggable.NotifFilter;

		import javax.inject.Inject;

		/**
		* Coordinates hiding (filtering) of media notifications.
		*/
		public class MediaCoordinator implements Coordinator {
		private static final String TAG = "MediaCoordinator";

		private final Boolean mIsMediaFeatureEnabled;

		private final NotifFilter mMediaFilter = new NotifFilter(TAG) {
		@Override
		public boolean shouldFilterOut(NotificationEntry entry, long now) {
		return mIsMediaFeatureEnabled && isMediaNotification(entry.getSbn());
		}
		};

		@Inject
		public MediaCoordinator(MediaFeatureFlag featureFlag) {
		mIsMediaFeatureEnabled = featureFlag.getEnabled();
		}

		@Override
		public void attach(NotifPipeline pipeline) {
		pipeline.addFinalizeFilter(mMediaFilter);
		}
		}

packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/NotifCoordinators.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -57,7 +57,8 @@ public class NotifCoordinators implements Dumpable {
		BubbleCoordinator bubbleCoordinator,
		HeadsUpCoordinator headsUpCoordinator,
		ConversationCoordinator conversationCoordinator,
		PreparationCoordinator preparationCoordinator) {
		PreparationCoordinator preparationCoordinator,
		MediaCoordinator mediaCoordinator) {
		dumpManager.registerDumpable(TAG, this);
		mCoordinators.add(new HideLocallyDismissedNotifsCoordinator());
		mCoordinators.add(hideNotifsForOtherUsersCoordinator);
		@@ -72,6 +73,7 @@ public class NotifCoordinators implements Dumpable {
		mCoordinators.add(preparationCoordinator);
		}
		// TODO: add new Coordinators here! (b/112656837)
		mCoordinators.add(mediaCoordinator);

		// TODO: add the sections in a particular ORDER (HeadsUp < People < Alerting)
		for (Coordinator c : mCoordinators) {

packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/NotificationFilterTest.java

+72 −1

Original line number	Diff line number	Diff line
		@@ -27,8 +27,10 @@ import static org.mockito.Mockito.when;

		import android.Manifest;
		import android.app.Notification;
		import android.app.Notification.MediaStyle;
		import android.content.pm.IPackageManager;
		import android.content.pm.PackageManager;
		import android.media.session.MediaSession;
		import android.os.Bundle;
		import android.service.notification.StatusBarNotification;
		import android.testing.AndroidTestingRunner;
		@@ -40,6 +42,7 @@ import androidx.test.filters.SmallTest;

		import com.android.systemui.ForegroundServiceController;
		import com.android.systemui.SysuiTestCase;
		import com.android.systemui.media.MediaFeatureFlag;
		import com.android.systemui.plugins.statusbar.StatusBarStateController;
		import com.android.systemui.statusbar.NotificationLockscreenUserManager;
		import com.android.systemui.statusbar.notification.NotificationEntryManager.KeyguardEnvironment;
		@@ -51,6 +54,7 @@ import com.android.systemui.statusbar.notification.row.NotificationTestHelper;
		import com.android.systemui.statusbar.phone.NotificationGroupManager;
		import com.android.systemui.statusbar.phone.ShadeController;

		import org.junit.After;
		import org.junit.Before;
		import org.junit.Test;
		import org.junit.runner.RunWith;
		@@ -73,10 +77,16 @@ public class NotificationFilterTest extends SysuiTestCase {
		ForegroundServiceController mFsc;
		@Mock
		KeyguardEnvironment mEnvironment;
		@Mock
		MediaFeatureFlag mMediaFeatureFlag;
		@Mock
		StatusBarStateController mStatusBarStateController;
		private final IPackageManager mMockPackageManager = mock(IPackageManager.class);

		private NotificationFilter mNotificationFilter;
		private ExpandableNotificationRow mRow;
		private NotificationEntry mMediaEntry;
		private MediaSession mMediaSession;

		@Before
		public void setUp() throws Exception {
		@@ -84,6 +94,12 @@ public class NotificationFilterTest extends SysuiTestCase {
		MockitoAnnotations.initMocks(this);
		when(mMockStatusBarNotification.getUid()).thenReturn(UID_NORMAL);

		mMediaSession = new MediaSession(mContext, "TEST_MEDIA_SESSION");
		NotificationEntryBuilder builder = new NotificationEntryBuilder();
		builder.modifyNotification(mContext).setStyle(
		new MediaStyle().setMediaSession(mMediaSession.getSessionToken()));
		mMediaEntry = builder.build();

		when(mMockPackageManager.checkUidPermission(
		eq(Manifest.permission.NOTIFICATION_DURING_SETUP),
		eq(UID_NORMAL)))
		@@ -107,7 +123,12 @@ public class NotificationFilterTest extends SysuiTestCase {
		mDependency,
		TestableLooper.get(this));
		mRow = testHelper.createRow();
		mNotificationFilter = new NotificationFilter(mock(StatusBarStateController.class));
		mNotificationFilter = new NotificationFilter(mStatusBarStateController, mMediaFeatureFlag);
		}

		@After
		public void tearDown() {
		mMediaSession.release();
		}

		@Test
		@@ -218,6 +239,56 @@ public class NotificationFilterTest extends SysuiTestCase {
		assertFalse(mNotificationFilter.shouldFilterOut(entry));
		}

		@Test
		public void shouldFilterOtherNotificationWhenDisabled() {
		// GIVEN that the media feature is disabled
		when(mMediaFeatureFlag.getEnabled()).thenReturn(false);
		NotificationFilter filter = new NotificationFilter(mStatusBarStateController,
		mMediaFeatureFlag);
		// WHEN the media filter is asked about an entry
		NotificationEntry otherEntry = new NotificationEntryBuilder().build();
		final boolean shouldFilter = filter.shouldFilterOut(otherEntry);
		// THEN it shouldn't be filtered
		assertFalse(shouldFilter);
		}

		@Test
		public void shouldFilterOtherNotificationWhenEnabled() {
		// GIVEN that the media feature is enabled
		when(mMediaFeatureFlag.getEnabled()).thenReturn(true);
		NotificationFilter filter = new NotificationFilter(mStatusBarStateController,
		mMediaFeatureFlag);
		// WHEN the media filter is asked about an entry
		NotificationEntry otherEntry = new NotificationEntryBuilder().build();
		final boolean shouldFilter = filter.shouldFilterOut(otherEntry);
		// THEN it shouldn't be filtered
		assertFalse(shouldFilter);
		}

		@Test
		public void shouldFilterMediaNotificationWhenDisabled() {
		// GIVEN that the media feature is disabled
		when(mMediaFeatureFlag.getEnabled()).thenReturn(false);
		NotificationFilter filter = new NotificationFilter(mStatusBarStateController,
		mMediaFeatureFlag);
		// WHEN the media filter is asked about a media entry
		final boolean shouldFilter = filter.shouldFilterOut(mMediaEntry);
		// THEN it shouldn't be filtered
		assertFalse(shouldFilter);
		}

		@Test
		public void shouldFilterMediaNotificationWhenEnabled() {
		// GIVEN that the media feature is enabled
		when(mMediaFeatureFlag.getEnabled()).thenReturn(true);
		NotificationFilter filter = new NotificationFilter(mStatusBarStateController,
		mMediaFeatureFlag);
		// WHEN the media filter is asked about a media entry
		final boolean shouldFilter = filter.shouldFilterOut(mMediaEntry);
		// THEN it should be filtered
		assertTrue(shouldFilter);
		}

		private void initStatusBarNotification(boolean allowDuringSetup) {
		Bundle bundle = new Bundle();
		bundle.putBoolean(Notification.EXTRA_ALLOW_DURING_SETUP, allowDuringSetup);