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

Commit 21dd960b authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Protect against NPE in onCallQualitychange callback." into main

parents 5936ad79 1c244d5f

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

+8 −6
Original line number Diff line number Diff line
@@ -4452,6 +4452,7 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall { 
        public void onCallQualityChanged(ImsCall imsCall, CallQuality callQuality) {

            // convert ServiceState.radioTech to TelephonyManager.NetworkType constant

            mPhone.onCallQualityChanged(callQuality, imsCall.getNetworkType());

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

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

                CallQualityMetrics cqm = mCallQualityMetrics.get(callId);

                if (cqm == null) {
@@ -4459,6 +4460,7 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall { 
                }

                cqm.saveCallQuality(callQuality);

                mCallQualityMetrics.put(callId, cqm);

            }



            ImsPhoneConnection conn = findConnection(imsCall);

            if (conn != null) {