Merge "Fix channel configurability check" (8c3fb57e) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/notification/NotificationPreferenceController.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -111,6 +111,9 @@ public abstract class NotificationPreferenceController extends AbstractPreferenc
		}

		protected boolean isChannelConfigurable() {
		if (mAppRow != null && mAppRow.lockedImportance) {
		return false;
		}
		if (mChannel != null && mAppRow != null) {
		return !Objects.equals(mChannel.getId(), mAppRow.lockedChannelId);
		}

+14 −0

Original line number	Diff line number	Diff line
		@@ -218,6 +218,20 @@ public class NotificationPreferenceControllerTest {
		assertTrue(mController.isChannelConfigurable());
		}

		@Test
		public void testIsConfigurable_appLevel() {
		NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
		appRow.lockedChannelId = "something";
		appRow.lockedImportance = true;

		mController.onResume(appRow, mock(NotificationChannel.class), null, null);
		assertFalse(mController.isChannelConfigurable());

		appRow.lockedImportance = false;
		mController.onResume(appRow, mock(NotificationChannel.class), null, null);
		assertTrue(mController.isChannelConfigurable());
		}

		@Test
		public void testIsChannelBlockable_nonSystemAppsBlockable() {
		NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();