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

Commit c92306b7 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 5671254 from 97e5eb0b to qt-release 

Change-Id: I4277881d6c88d846094da5206e160947a9c8c1c1
parents 5fa5219d 97e5eb0b

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

+9 −2
Original line number Original line Diff line number Diff line
@@ -56,6 +56,7 @@ import com.android.internal.telephony.MmiCode; 
import com.android.internal.telephony.Phone;

import com.android.internal.telephony.Phone;

import com.android.internal.telephony.uicc.IccRecords;

import com.android.internal.telephony.uicc.IccRecords;





import java.util.Arrays;

import java.util.List;

import java.util.List;

import java.util.regex.Matcher;

import java.util.regex.Matcher;

import java.util.regex.Pattern;

import java.util.regex.Pattern;
@@ -1550,8 +1551,14 @@ public final class ImsPhoneMmiCode extends Handler implements MmiCode { 
                sb.append(getErrorMessage(ar));

                sb.append(getErrorMessage(ar));

            }

            }

        } else {

        } else {

            List<ImsSsInfo> infos = (List<ImsSsInfo>) ar.result;

            List<ImsSsInfo> infos = null;

            if (infos.size() == 0) {

            try {

                infos = (List<ImsSsInfo>) ar.result;

            } catch (ClassCastException cce) {

                // TODO in R: #157# still has ImsSsInfo[] type, fix the type in IImsUtListener.aidl.

                infos = Arrays.asList((ImsSsInfo[]) ar.result);

            }

            if (infos == null || infos.size() == 0) {

                sb.append(mContext.getText(com.android.internal.R.string.serviceDisabled));

                sb.append(mContext.getText(com.android.internal.R.string.serviceDisabled));

            } else {

            } else {

                ImsSsInfo info;

                ImsSsInfo info;