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

Commit ab727298 authored by Geoffrey Pitsch's avatar Geoffrey Pitsch Committed by android-build-merger
Browse files

Merge "Further bulletproof NotificationInfo's public api from exceptions" into... 

Merge "Further bulletproof NotificationInfo's public api from exceptions" into oc-dev am: 390cdab4
am: 442a4e4c

Change-Id: I9de7dc27370a73da838c7c5540faa6542e4a9432
parents ba93a15c 442a4e4c

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);
@@ -386,7 +384,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
@@ -778,4 +778,9 @@ public class NotificationInfoTest extends SysuiTestCase { 
        enabledSwitch.setChecked(true);

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

    }



    @Test

    public void testWillBeRemovedReturnsFalseBeforeBind() throws Exception {

        assertFalse(mNotificationInfo.willBeRemoved());

    }

}