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

Commit 2dd0df64 authored by Avinash Malipatil's avatar Avinash Malipatil
Browse files

Compare domain selection results based on flag and trigger bug report if results are not same. 

Bug: 263552148
Test: Manual call testing
Change-Id: I29def5611f1e410f7d8bbabaf347f014371462b4
parent d5210a5d

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

+23 −0
Original line number Diff line number Diff line
@@ -16,7 +16,10 @@ 


package com.android.internal.telephony;



import static android.telephony.NetworkRegistrationInfo.DOMAIN_CS;

import static android.telephony.NetworkRegistrationInfo.DOMAIN_CS_PS;

import static android.telephony.NetworkRegistrationInfo.DOMAIN_PS;

import static android.telephony.NetworkRegistrationInfo.DOMAIN_UNKNOWN;



import static com.android.internal.telephony.CommandException.Error.GENERIC_FAILURE;

import static com.android.internal.telephony.CommandException.Error.SIM_BUSY;
@@ -72,6 +75,7 @@ import android.telecom.VideoProfile; 
import android.telephony.AccessNetworkConstants.TransportType;

import android.telephony.Annotation.DataActivityType;

import android.telephony.Annotation.RadioPowerState;

import android.telephony.AnomalyReporter;

import android.telephony.BarringInfo;

import android.telephony.CarrierConfigManager;

import android.telephony.CellBroadcastIdRange;
@@ -140,6 +144,7 @@ import java.util.Iterator; 
import java.util.List;

import java.util.Locale;

import java.util.Set;

import java.util.UUID;

import java.util.function.Consumer;

import java.util.regex.Matcher;

import java.util.regex.Pattern;
@@ -1428,6 +1433,24 @@ public class GsmCdmaPhone extends Phone { 
                && (isWpsCall ? allowWpsOverIms : true);



        Bundle extras = dialArgs.intentExtras;

        if (extras != null && extras.containsKey(PhoneConstants.EXTRA_COMPARE_DOMAIN)) {

            int domain = extras.getInt(PhoneConstants.EXTRA_DIAL_DOMAIN);

            if (!isEmergency && (!isMmiCode || isPotentialUssdCode)) {

                if ((domain == DOMAIN_PS && !useImsForCall)

                        || (domain == DOMAIN_CS && useImsForCall)

                        || domain == DOMAIN_UNKNOWN || domain == DOMAIN_CS_PS) {

                    loge("[Anomaly] legacy-useImsForCall:" + useImsForCall

                            + ", NCDS-domain:" + domain);



                    AnomalyReporter.reportAnomaly(

                            UUID.fromString("bfae6c2e-ca2f-4121-b167-9cad26a3b353"),

                            "Domain selection results don't match. useImsForCall:"

                                    + useImsForCall + ", NCDS-domain:" + domain);

                }

            }

            extras.remove(PhoneConstants.EXTRA_COMPARE_DOMAIN);

        }



        // Only when the domain selection service is supported, EXTRA_DIAL_DOMAIN extra shall exist.

        if (extras != null && extras.containsKey(PhoneConstants.EXTRA_DIAL_DOMAIN)) {

            int domain = extras.getInt(PhoneConstants.EXTRA_DIAL_DOMAIN);