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

Commit 5c53ac1a authored by Beverly's avatar Beverly Committed by android-build-merger
Browse files

Merge "Allow updates to importance of default apps" into qt-dev am: ad204b6e am: b56307ac 

am: 02ac53a8

Change-Id: Id9d26ee8168daead7e33bea5e37804b77656b141
parents 04a3bc14 02ac53a8

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

+2 −1
Original line number Diff line number Diff line
@@ -736,7 +736,8 @@ public class PreferencesHelper implements RankingConfig { 
            }

            updatedChannel.setImportanceLockedByCriticalDeviceFunction(

                    r.defaultAppLockedImportance);

            if (updatedChannel.isImportanceLockedByCriticalDeviceFunction()) {

            if (updatedChannel.isImportanceLockedByCriticalDeviceFunction()

                    && updatedChannel.getImportance() == IMPORTANCE_NONE) {

                updatedChannel.setImportance(channel.getImportance());

            }

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

+9 −6
Original line number Diff line number Diff line
@@ -66,6 +66,9 @@ import android.util.ArraySet; 
import android.util.Pair;

import android.util.Xml;



import androidx.test.InstrumentationRegistry;

import androidx.test.runner.AndroidJUnit4;



import com.android.internal.util.FastXmlSerializer;

import com.android.server.UiServiceTestCase;
@@ -90,9 +93,6 @@ import java.util.Map; 
import java.util.Objects;

import java.util.concurrent.ThreadLocalRandom;



import androidx.test.InstrumentationRegistry;

import androidx.test.runner.AndroidJUnit4;



@SmallTest

@RunWith(AndroidJUnit4.class)

public class PreferencesHelperTest extends UiServiceTestCase {
@@ -2520,7 +2520,6 @@ public class PreferencesHelperTest extends UiServiceTestCase { 
        toAdd.add(new Pair(PKG_O, UID_O));

        mHelper.updateDefaultApps(UserHandle.getUserId(UID_O), null, toAdd);





        assertTrue(mHelper.getNotificationChannel(PKG_O, UID_O, a.getId(), false)

                .isImportanceLockedByCriticalDeviceFunction());

        assertFalse(mHelper.getNotificationChannel(PKG_N_MR1, UID_N_MR1, b.getId(), false)
@@ -2623,16 +2622,20 @@ public class PreferencesHelperTest extends UiServiceTestCase { 
        update.setAllowBubbles(false);



        mHelper.updateNotificationChannel(PKG_O, UID_O, update, true);



        assertEquals(IMPORTANCE_HIGH,

                mHelper.getNotificationChannel(PKG_O, UID_O, a.getId(), false).getImportance());

        assertEquals(false,

                mHelper.getNotificationChannel(PKG_O, UID_O, a.getId(), false).canBubble());



        mHelper.updateNotificationChannel(PKG_O, UID_O, update, false);



        assertEquals(IMPORTANCE_HIGH,

                mHelper.getNotificationChannel(PKG_O, UID_O, a.getId(), false).getImportance());



        NotificationChannel updateImportanceLow = new NotificationChannel("a", "a",

                IMPORTANCE_LOW);

        mHelper.updateNotificationChannel(PKG_O, UID_O, updateImportanceLow, true);

        assertEquals(IMPORTANCE_LOW,

                mHelper.getNotificationChannel(PKG_O, UID_O, a.getId(), false).getImportance());

    }



    @Test