Merge "Fix the Java crash in Settings : java.lang.IndexOutOfBoundsException" into 24D1-dev

This commit is contained in:
SongFerng Wang
2024-04-29 11:39:12 +00:00
committed by Android (Google) Code Review

View File

@@ -248,7 +248,8 @@ public class SubscriptionUtil {
if (activeSlotSubInfoList.size() > 0) {
return (activeSlotSubInfoList.get(0).getSubscriptionId() == subId);
}
return (inactiveSlotSubInfoList.get(0).getSubscriptionId() == subId);
return (inactiveSlotSubInfoList.size() > 0)
&& (inactiveSlotSubInfoList.get(0).getSubscriptionId() == subId);
}
// Allow non-opportunistic + active eSIM subscription as primary