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

Commit 8c8dbdef authored by Geoffrey Pitsch's avatar Geoffrey Pitsch
Browse files

Further bulletproof NotificationInfo's public api from exceptions 

Change-Id: Iae33e416afdaf29e932a4b1486a3902e0135d8e7
Fixes: 36568713
Test: runtest systemui
parent a017e573

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

+4 −6
Original line number Diff line number Diff line
@@ -262,17 +262,15 @@ public class NotificationInfo extends LinearLayout implements NotificationGuts.G 


    private boolean hasImportanceChanged() {

        return mSingleNotificationChannel != null &&

                mChannelEnabledSwitch != null &&

                mStartingUserImportance != getSelectedImportance();

    }



    private void saveImportance() {

        if (mSingleNotificationChannel == null) {

            return;

        }

        int selectedImportance = getSelectedImportance();

        if (selectedImportance == mStartingUserImportance) {

        if (!hasImportanceChanged()) {

            return;

        }

        final int selectedImportance = getSelectedImportance();

        MetricsLogger.action(mContext, MetricsEvent.ACTION_SAVE_IMPORTANCE,

                selectedImportance - mStartingUserImportance);

        mSingleNotificationChannel.setImportance(selectedImportance);
@@ -384,7 +382,7 @@ public class NotificationInfo extends LinearLayout implements NotificationGuts.G 


    @Override

    public boolean willBeRemoved() {

        return !mChannelEnabledSwitch.isChecked();

        return mChannelEnabledSwitch != null && !mChannelEnabledSwitch.isChecked();

    }



    @Override

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

+5 −0
Original line number Diff line number Diff line
@@ -780,4 +780,9 @@ public class NotificationInfoTest extends SysuiTestCase { 
        enabledSwitch.setChecked(true);

        assertEquals(View.VISIBLE, settingsLink.getVisibility());

    }



    @Test

    public void testWillBeRemovedReturnsFalseBeforeBind() throws Exception {

        assertFalse(mNotificationInfo.willBeRemoved());

    }

}