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

Commit 080174ec authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Protecting Null Pointer Exception for Terminated IMS call." into tm-qpr-dev am: 8b373ce2 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/20181704



Change-Id: Ibaf1a4b4a8bc5c85c4a1c1cd740178bddfda7fe9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 228118ad 8b373ce2

src/java/com/android/internal/telephony/imsphone/ImsPhoneCallTracker.java

+12 −13
Original line number Diff line number Diff line
@@ -3388,15 +3388,13 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall { 
                cause = DisconnectCause.IMS_MERGED_SUCCESSFULLY;

            }



            String callId = imsCall.getSession().getCallId();

            EmergencyNumberTracker emergencyNumberTracker = null;

            EmergencyNumber num = null;



            if (conn != null) {

            if (conn != null && imsCall.getSession() != null) {

                String callId = imsCall.getSession().getCallId();

                emergencyNumberTracker = conn.getEmergencyNumberTracker();

                num = conn.getEmergencyNumberInfo();

            }



                mMetrics.writeOnImsCallTerminated(mPhone.getPhoneId(), imsCall.getCallSession(),

                    reasonInfo, mCallQualityMetrics.get(callId), num,

                    getNetworkCountryIso(), emergencyNumberTracker != null
@@ -3411,6 +3409,7 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall { 
                    mCallQualityMetricsHistory.add(lastCallMetrics);

                }

                pruneCallQualityMetricsHistory();

            }

            mPhone.notifyImsReason(reasonInfo);



            if (conn != null) {