Merge "Prevent null from getMergedImsisFromGroup()" into main

2023-07-18 12:39:00 +00:00
parent f09d89ab00 aaa1196745
commit 1746a3dd46
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) {
        }