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

Commit 3968d9ae authored by Hall Liu's avatar Hall Liu Committed by Automerger Merge Worker
Browse files

Merge "Rename NotificationChannel#setBlockableSystem" into rvc-dev am: 05970b8d 

Change-Id: Ibfcd518da1838a433e8165c4e43e6e27fbc7999d
parents 7107a6f5 05970b8d

src/java/com/android/internal/telephony/util/NotificationChannelController.java

+2 −2
Original line number Diff line number Diff line
@@ -70,14 +70,14 @@ public class NotificationChannelController { 
        alertChannel.setSound(Settings.System.DEFAULT_NOTIFICATION_URI,

                new AudioAttributes.Builder().setUsage(AudioAttributes.USAGE_NOTIFICATION).build());

        // allow users to block notifications from system

        alertChannel.setBlockableSystem(true);

        alertChannel.setBlockable(true);



        final NotificationChannel mobileDataStatusChannel = new NotificationChannel(

                CHANNEL_ID_MOBILE_DATA_STATUS,

                context.getText(R.string.notification_channel_mobile_data_status),

                NotificationManager.IMPORTANCE_LOW);

        // allow users to block notifications from system

        mobileDataStatusChannel.setBlockableSystem(true);

        mobileDataStatusChannel.setBlockable(true);



        final NotificationChannel simChannel = new NotificationChannel(

                CHANNEL_ID_SIM,