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

Commit 29ae3dab authored by Chi Zhang's avatar Chi Zhang Committed by Automerger Merge Worker
Browse files

Merge "Handle invalid carrier ID in voice call atoms." am: 443f1585 am: 1b24ea77 am: d3077b6b 

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

Change-Id: I14b106863acf743afceaf7af75e4ae8254262b00
parents 26bf812f d3077b6b

src/java/com/android/internal/telephony/CarrierResolver.java

+2 −2
Original line number Diff line number Diff line
@@ -148,8 +148,8 @@ public class CarrierResolver extends Handler { 
            int subId = intent.getIntExtra("sub_id",

                    SubscriptionManager.getDefaultSubscriptionId());



            if (carrierId == TelephonyManager.UNKNOWN_CARRIER_ID) {

                logd("Override carrier id can't be -1.", phoneId);

            if (carrierId <= 0) {

                logd("Override carrier id must be greater than 0.", phoneId);

                return;

            } else if (subId != mPhone.getSubId()) {

                logd("Override carrier id failed. The sub id doesn't same as phone's sub id.",

src/java/com/android/internal/telephony/metrics/VoiceCallSessionStats.java

+5 −0
Original line number Diff line number Diff line
@@ -446,6 +446,11 @@ public class VoiceCallSessionStats { 
            proto.disconnectExtraMessage = "";

        }



        // Retry populating carrier ID if it was invalid

        if (proto.carrierId <= 0) {

            proto.carrierId = mPhone.getCarrierId();

        }



        mAtomsStorage.addVoiceCallSession(proto);



        // merge RAT usages to PersistPullers when the call session ends (i.e. no more active calls)