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

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

Merge "Notification method renames." into oc-dev

parents bff46519 e61d1f80

src/java/com/android/internal/telephony/InboundSmsHandler.java

+1 −1
Original line number Diff line number Diff line
@@ -919,7 +919,7 @@ public abstract class InboundSmsHandler extends StateMachine { 
                .setContentTitle(mContext.getString(R.string.new_sms_notification_title))

                .setContentText(mContext.getString(R.string.new_sms_notification_content))

                .setContentIntent(intent)

                .setChannel(TelephonyNotificationBuilder.CHANNEL_ID_SMS);

                .setChannelId(TelephonyNotificationBuilder.CHANNEL_ID_SMS);

        NotificationManager mNotificationManager =

            (NotificationManager) mContext.getSystemService(Context.NOTIFICATION_SERVICE);

        mNotificationManager.notify(

src/java/com/android/internal/telephony/imsphone/ImsPhone.java

+1 −1
Original line number Diff line number Diff line
@@ -1561,7 +1561,7 @@ public class ImsPhone extends ImsPhoneBase { 
                                .setContentIntent(resultPendingIntent)

                                .setStyle(new Notification.BigTextStyle()

                                .bigText(messageNotification))

                                .setChannel(TelephonyNotificationBuilder.CHANNEL_ID_WFC)

                                .setChannelId(TelephonyNotificationBuilder.CHANNEL_ID_WFC)

                                .build();

                final String notificationTag = "wifi_calling";

                final int notificationId = 1;

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

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ public class TelephonyNotificationBuilder extends Notification.Builder { 
        NotificationChannel channel = getNotificationManager(mContext)

                .getNotificationChannel(channelId);

        if (channel == null) channel = createChannel(mContext, channelId);

        return super.setChannel(channel.getId());

        return super.setChannelId(channel.getId());

    }



    public TelephonyNotificationBuilder(Context context) {