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

Commit 77f6649b authored by Julia Reynolds's avatar Julia Reynolds Committed by android-build-merger
Browse files

Merge "Lock more of the things" into qt-dev am: 688224b7 

am: de7e7ae9

Change-Id: I6d8c99e8e02b333c8c687b904690d951fb08d4a4
parents 9f5580bc de7e7ae9

services/core/java/com/android/server/notification/PreferencesHelper.java

+450 −376

File changed.

Preview size limit exceeded, changes collapsed.

services/tests/uiservicestests/src/com/android/server/notification/PreferencesHelperTest.java

+2 −2
Original line number Diff line number Diff line
@@ -940,12 +940,12 @@ public class PreferencesHelperTest extends UiServiceTestCase { 
    @Test

    public void testClearLockedFields() {

        final NotificationChannel channel = getChannel();

        mHelper.clearLockedFields(channel);

        mHelper.clearLockedFieldsLocked(channel);

        assertEquals(0, channel.getUserLockedFields());



        channel.lockFields(NotificationChannel.USER_LOCKED_PRIORITY

                | NotificationChannel.USER_LOCKED_IMPORTANCE);

        mHelper.clearLockedFields(channel);

        mHelper.clearLockedFieldsLocked(channel);

        assertEquals(0, channel.getUserLockedFields());

    }