diff options
author | uabdullah <uabdullah@google.com> | 2017-09-20 00:02:29 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-09-20 00:02:29 +0000 |
commit | 495bc572a678b8873bb86d4dafdd4c5febe36fc9 (patch) | |
tree | 429c9f6a5537f31ea8f557ceb420a49247702fc7 | |
parent | bf81580df17bded285f2dcb0c9e1de2fe85dce0c (diff) | |
parent | 016c898ad758f683d82abb7c920da3280fb6bd92 (diff) |
Merge "Refactor second call logging"
am: 016c898ad7
Change-Id: I40567d0f967000306d02de63ae3fe37edf603f62
-rw-r--r-- | java/com/android/incallui/call/CallList.java | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/java/com/android/incallui/call/CallList.java b/java/com/android/incallui/call/CallList.java index 954fdc910..c4b29d918 100644 --- a/java/com/android/incallui/call/CallList.java +++ b/java/com/android/incallui/call/CallList.java @@ -118,7 +118,9 @@ public class CallList implements DialerCallDelegate { Trace.beginSection("CallList.onCallAdded"); final DialerCall call = new DialerCall(context, this, telecomCall, latencyReport, true /* registerCallback */); - logSecondIncomingCall(context, call); + if (getFirstCall() != null) { + logSecondIncomingCall(context, getFirstCall(), call); + } EnrichedCallManager manager = EnrichedCallComponent.get(context).getEnrichedCallManager(); manager.registerCapabilitiesListener(call); @@ -206,28 +208,26 @@ public class CallList implements DialerCallDelegate { Trace.endSection(); } - private void logSecondIncomingCall(@NonNull Context context, @NonNull DialerCall incomingCall) { - DialerCall firstCall = getFirstCall(); - if (firstCall != null) { - DialerImpression.Type impression; - if (firstCall.isVideoCall()) { - if (incomingCall.isVideoCall()) { - impression = DialerImpression.Type.VIDEO_CALL_WITH_INCOMING_VIDEO_CALL; - } else { - impression = DialerImpression.Type.VIDEO_CALL_WITH_INCOMING_VOICE_CALL; - } + private void logSecondIncomingCall( + @NonNull Context context, @NonNull DialerCall firstCall, @NonNull DialerCall incomingCall) { + DialerImpression.Type impression; + if (firstCall.isVideoCall()) { + if (incomingCall.isVideoCall()) { + impression = DialerImpression.Type.VIDEO_CALL_WITH_INCOMING_VIDEO_CALL; } else { - if (incomingCall.isVideoCall()) { - impression = DialerImpression.Type.VOICE_CALL_WITH_INCOMING_VIDEO_CALL; - } else { - impression = DialerImpression.Type.VOICE_CALL_WITH_INCOMING_VOICE_CALL; - } + impression = DialerImpression.Type.VIDEO_CALL_WITH_INCOMING_VOICE_CALL; + } + } else { + if (incomingCall.isVideoCall()) { + impression = DialerImpression.Type.VOICE_CALL_WITH_INCOMING_VIDEO_CALL; + } else { + impression = DialerImpression.Type.VOICE_CALL_WITH_INCOMING_VOICE_CALL; } - Assert.checkArgument(impression != null); - Logger.get(context) - .logCallImpression( - impression, incomingCall.getUniqueCallId(), incomingCall.getTimeAddedMs()); } + Assert.checkArgument(impression != null); + Logger.get(context) + .logCallImpression( + impression, incomingCall.getUniqueCallId(), incomingCall.getTimeAddedMs()); } private static boolean isPotentialEmergencyCallback(Context context, DialerCall call) { |