Prevent null from getMergedImsisFromGroup()

Fix: 290698752 Test: presubmit Change-Id: Icea4a2e29b2f286dc7c5903d4da8ae4972db4053
2023-07-11 10:36:13 +08:00
parent efc969f92f
commit aaa1196745
1 changed files with 5 additions and 1 deletions
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -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) {
        }