PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix channel configurability check"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-03-15 21:57:23 +00:00
committed by Android (Google) Code Review
parent 4c42163093 9c6f1aa74b
commit 8c3fb57ea3
2 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/notification/NotificationPreferenceController.java
View File

@@ -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
tests/robotests/src/com/android/settings/notification/NotificationPreferenceControllerTest.java
View File

@@ -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();