diff options
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/NotificationGuts.java | 4 | ||||
| -rw-r--r-- | packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationGutsTest.java | 12 |
2 files changed, 14 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationGuts.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationGuts.java index 088f5382b684..c7adb60c25f3 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationGuts.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationGuts.java @@ -313,7 +313,7 @@ public class NotificationGuts extends LinearLayout { } else if (mHighImportanceButton.isChecked()) { return NotificationManager.IMPORTANCE_HIGH; } else { - return NotificationManager.IMPORTANCE_NONE; + return NotificationManager.IMPORTANCE_UNSPECIFIED; } } @@ -333,10 +333,10 @@ public class NotificationGuts extends LinearLayout { // Set to current importance setting switch (importance) { + case NotificationManager.IMPORTANCE_UNSPECIFIED: case NotificationManager.IMPORTANCE_NONE: break; case NotificationManager.IMPORTANCE_MIN: - case NotificationManager.IMPORTANCE_UNSPECIFIED: mMinImportanceButton.setChecked(true); break; case NotificationManager.IMPORTANCE_LOW: diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationGutsTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationGutsTest.java index 2cd6dbd17a7c..c65f7150de0e 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationGutsTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationGutsTest.java @@ -210,6 +210,18 @@ public class NotificationGutsTest { @Test @UiThreadTest + public void testCloseControls_DoesNotUpdateNotificationChannelIfUnspecified() throws Exception { + mNotificationChannel.setImportance(NotificationManager.IMPORTANCE_UNSPECIFIED); + mNotificationGuts.bindNotification(mMockPackageManager, mMockINotificationManager, + mMockStatusBarNotification, null, null, null); + + mNotificationGuts.closeControls(-1, -1, true); + verify(mMockINotificationManager, never()).updateNotificationChannelForPackage( + anyString(), anyInt(), any()); + } + + @Test + @UiThreadTest public void testCloseControls_CallsUpdateNotificationChannelIfChanged() throws Exception { mNotificationChannel.setImportance(NotificationManager.IMPORTANCE_LOW); mNotificationGuts.bindNotification(mMockPackageManager, mMockINotificationManager, |