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

Commit 4e7ae02c authored by Geoffrey Pitsch's avatar Geoffrey Pitsch
Browse files

Do not select an importance for unspecified notifications 

Test: runtest systemui-notification
Bug: 34164846
Change-Id: I4988ce26264853fd9ab84ae02e995641edf933cd
parent b03bfe0a

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

+2 −2
Original line number Diff line number Diff line
@@ -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:

packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationGutsTest.java

+12 −0
Original line number Diff line number Diff line
@@ -208,6 +208,18 @@ public class NotificationGutsTest { 
                anyString(), anyInt(), any());

    }



    @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 {