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

Commit 1746a3dd authored by Chaohui Wang's avatar Chaohui Wang Committed by Android (Google) Code Review
Browse files

Merge "Prevent null from getMergedImsisFromGroup()" into main

parents f09d89ab aaa11967

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) {

        }