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

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

Merge "Notification method renames." into oc-dev 

am: d62e9610

Change-Id: Icc9ec0772246a6ffc15f603b7cdeda5db5f18447
parents 38adc0f9 d62e9610

src/com/android/server/telecom/ui/IncomingCallNotifier.java

+1 −1
Original line number Diff line number Diff line
@@ -263,7 +263,7 @@ public class IncomingCallNotifier extends CallsManagerListenerBase { 
        builder.setContentTitle(incomingCallText);

        builder.setContentText(disconnectText);

        builder.setSmallIcon(R.drawable.ic_phone);

        builder.setChannel(NotificationChannelManager.CHANNEL_ID_INCOMING_CALLS);

        builder.setChannelId(NotificationChannelManager.CHANNEL_ID_INCOMING_CALLS);

        // Ensures this is a heads up notification.  A heads-up notification is typically only shown

        // if there is a fullscreen intent.  However since this notification doesn't have that we

        // will use this trick to get it to show as one anyways.

src/com/android/server/telecom/ui/MissedCallNotifierImpl.java

+1 −1
Original line number Diff line number Diff line
@@ -332,7 +332,7 @@ public class MissedCallNotifierImpl extends CallsManagerListenerBase implements 
                // notification is shown on the user's lock screen and they have chosen to hide

                // sensitive notification information.

                .setPublicVersion(publicBuilder.build())

                .setChannel(NotificationChannelManager.CHANNEL_ID_MISSED_CALLS);

                .setChannelId(NotificationChannelManager.CHANNEL_ID_MISSED_CALLS);



        Uri handleUri = callInfo.getHandle();

        String handle = callInfo.getHandleSchemeSpecificPart();