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

Commit 0f8e7964 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix NPE in DialerCall that cause it crash and failed to show... 

Merge "Fix NPE in DialerCall that cause it crash and failed to show disconnection error message." am: 5d01ebb8 am: e2eb24bd am: a31d71bd

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Dialer/+/1671906

Change-Id: Ic6cbd99e9daf9d0c34ab01da72b185571db36cbd
parents 7a9cb8a8 a31d71bd

java/com/android/incallui/CallButtonPresenter.java

+14 −10
Original line number Diff line number Diff line
@@ -208,19 +208,23 @@ public class CallButtonPresenter 
    int newRoute;

    if (audioState.getRoute() == CallAudioState.ROUTE_SPEAKER) {

      newRoute = CallAudioState.ROUTE_WIRED_OR_EARPIECE;

      if (call != null) {

        Logger.get(context)

                .logCallImpression(

                        DialerImpression.Type.IN_CALL_SCREEN_TURN_ON_WIRED_OR_EARPIECE,

                        call.getUniqueCallId(),

                        call.getTimeAddedMs());

      }

    } else {

      newRoute = CallAudioState.ROUTE_SPEAKER;

      if (call != null) {

        Logger.get(context)

                .logCallImpression(

                        DialerImpression.Type.IN_CALL_SCREEN_TURN_ON_SPEAKERPHONE,

                        call.getUniqueCallId(),

                        call.getTimeAddedMs());

      }

    }



    setAudioRoute(newRoute);

  }