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

Commit aaa11967 authored by Chaohui Wang's avatar Chaohui Wang
Browse files

Prevent null from getMergedImsisFromGroup() 

Fix: 290698752
Test: presubmit
Change-Id: Icea4a2e29b2f286dc7c5903d4da8ae4972db4053
parent efc969f9

telephony/java/android/telephony/TelephonyManager.java

+5 −1
Original line number Diff line number Diff line
@@ -5268,7 +5268,11 @@ public class TelephonyManager { 
        try {

            ITelephony telephony = getITelephony();

            if (telephony != null) {

                return telephony.getMergedImsisFromGroup(getSubId(), getOpPackageName());

                String[] mergedImsisFromGroup =

                        telephony.getMergedImsisFromGroup(getSubId(), getOpPackageName());

                if (mergedImsisFromGroup != null) {

                    return mergedImsisFromGroup;

                }

            }

        } catch (RemoteException ex) {

        }