diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-04-09 19:18:39 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-09 19:18:39 +0000 |
| commit | 0f8e79642c5854fe8ed39e240e7582be822eb961 (patch) | |
| tree | 1bf17af7e3d0c7ffe3c32a342b5bee88e2390383 /java/com | |
| parent | 7a9cb8a85bcfbda4ebf3fae7966902a4c6b110b6 (diff) | |
| parent | a31d71bd345c126a2f18f5fc1b3826bba290d1b0 (diff) | |
| download | Dialer-0f8e79642c5854fe8ed39e240e7582be822eb961.tar.gz | |
Merge "Fix NPE in DialerCall that cause it crash and failed to show disconnection error message." am: 5d01ebb84a am: e2eb24bd29 am: a31d71bd34
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Dialer/+/1671906
Change-Id: Ic6cbd99e9daf9d0c34ab01da72b185571db36cbd
Diffstat (limited to 'java/com')
| -rw-r--r-- | java/com/android/incallui/CallButtonPresenter.java | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/java/com/android/incallui/CallButtonPresenter.java b/java/com/android/incallui/CallButtonPresenter.java index 2a9600a2b..f2f7a405d 100644 --- a/java/com/android/incallui/CallButtonPresenter.java +++ b/java/com/android/incallui/CallButtonPresenter.java @@ -208,18 +208,22 @@ public class CallButtonPresenter int newRoute; if (audioState.getRoute() == CallAudioState.ROUTE_SPEAKER) { newRoute = CallAudioState.ROUTE_WIRED_OR_EARPIECE; - Logger.get(context) - .logCallImpression( - DialerImpression.Type.IN_CALL_SCREEN_TURN_ON_WIRED_OR_EARPIECE, - call.getUniqueCallId(), - call.getTimeAddedMs()); + 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; - Logger.get(context) - .logCallImpression( - DialerImpression.Type.IN_CALL_SCREEN_TURN_ON_SPEAKERPHONE, - call.getUniqueCallId(), - call.getTimeAddedMs()); + if (call != null) { + Logger.get(context) + .logCallImpression( + DialerImpression.Type.IN_CALL_SCREEN_TURN_ON_SPEAKERPHONE, + call.getUniqueCallId(), + call.getTimeAddedMs()); + } } setAudioRoute(newRoute); |