| commit | 55927a631877c02a5cfb084b6b4863ecf281a624 | [log] [tgz] |
|---|---|---|
| author | SongFerng Wang <songferngwang@google.com> | Mon Apr 29 12:03:05 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Apr 29 12:03:05 2024 +0000 |
| tree | ee46337ba7c330b095420e13965e1bdac160723a | |
| parent | 0f4d761d9378bccef141645123623a648cefe93a [diff] | |
| parent | 33f5aa3897608239253344c07b2ff0d5ac44dd49 [diff] |
Merge "Fix the Java crash in Settings : java.lang.IndexOutOfBoundsException" into 24D1-dev am: 33f5aa3897 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27139247 Change-Id: I832da1d22799ba554696a66c2087c1ab6c84e201 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/src/com/android/settings/network/SubscriptionUtil.java b/src/com/android/settings/network/SubscriptionUtil.java index 6b2a8d3..ff88b1a 100644 --- a/src/com/android/settings/network/SubscriptionUtil.java +++ b/src/com/android/settings/network/SubscriptionUtil.java
@@ -249,7 +249,8 @@ 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