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

Commit f61985f0 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Changing importance should record user locked field." into oc-dev

parents fac61e49 8ceb579e

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

+1 −0
Original line number Diff line number Diff line
@@ -274,6 +274,7 @@ public class NotificationInfo extends LinearLayout implements NotificationGuts.G 
        MetricsLogger.action(mContext, MetricsEvent.ACTION_SAVE_IMPORTANCE,

                selectedImportance - mStartingUserImportance);

        mSingleNotificationChannel.setImportance(selectedImportance);

        mSingleNotificationChannel.lockFields(NotificationChannel.USER_LOCKED_IMPORTANCE);

        try {

            mINotificationManager.updateNotificationChannelForPackage(

                    mPkg, mAppUid, mSingleNotificationChannel);

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

+8 −2
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ import com.android.systemui.SysuiTestCase; 
import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.ArgumentCaptor;



import java.util.ArrayList;

import java.util.Arrays;
@@ -585,11 +586,16 @@ public class NotificationInfoTest extends SysuiTestCase { 
                mNotificationChannel.getImportance(), mSbn, null, null, null,

                null, Collections.singleton(TEST_PACKAGE_NAME));



        Switch enabledSwitch = (Switch) mNotificationInfo.findViewById(R.id.channel_enabled_switch);

        Switch enabledSwitch = mNotificationInfo.findViewById(R.id.channel_enabled_switch);

        enabledSwitch.setChecked(false);

        mNotificationInfo.handleCloseControls(true);



        ArgumentCaptor<NotificationChannel> updated =

                ArgumentCaptor.forClass(NotificationChannel.class);

        verify(mMockINotificationManager, times(1)).updateNotificationChannelForPackage(

                eq(TEST_PACKAGE_NAME), anyInt(), eq(mNotificationChannel));

                anyString(), anyInt(), updated.capture());

        assertTrue((updated.getValue().getUserLockedFields()

                & NotificationChannel.USER_LOCKED_IMPORTANCE) != 0);

    }



    @Test