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

Commit 0ddedc34 authored by Grace Jia's avatar Grace Jia
Browse files

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

disconnection error message.

Bug: 184662292
Test: Manual test to guarantee the error message
Change-Id: I29ad67fdbe66a4ee246d3ecbaf0967e9f89df6cf
parent 59e8aa35

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);

  }