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

Commit 1f39d34d authored by Radhika Agrawal's avatar Radhika Agrawal Committed by Automerger Merge Worker
Browse files

Merge "Null check on connection Test: make Bug: b/160213239 Change-Id:... 

Merge "Null check on connection Test: make Bug: b/160213239 Change-Id: I1f7fba48caa326653b623b044734659a6fab4daa" into rvc-qpr-dev am: 41c13605 am: 992a3b88

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

Change-Id: I93acad332554e9fd91ea093bb748572ecfca2694
parents 3ff412ce 992a3b88

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

+9 −2
Original line number Diff line number Diff line
@@ -2937,9 +2937,16 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall { 
            }



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

            EmergencyNumberTracker emergencyNumberTracker = conn.getEmergencyNumberTracker();

            EmergencyNumberTracker emergencyNumberTracker = null;

            EmergencyNumber num = null;



            if (conn != null) {

                emergencyNumberTracker = conn.getEmergencyNumberTracker();

                num = conn.getEmergencyNumberInfo();

            }



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

                    reasonInfo, mCallQualityMetrics.get(callId), conn.getEmergencyNumberInfo(),

                    reasonInfo, mCallQualityMetrics.get(callId), num,

                    getNetworkCountryIso(), emergencyNumberTracker != null

                    ? emergencyNumberTracker.getEmergencyNumberDbVersion()

                    : TelephonyManager.INVALID_EMERGENCY_NUMBER_DB_VERSION);