Unable to enable the removable esim

When the user enable the removable esim, the settings select wrong slot(esim slot). The slot shold be the removable + esim slot and the UiccCardInfo's cardId is the same as the removable esim's cardId. Bug: 233170453 Bug: 233338345 Test: atest UiccSlotUtilTest Change-Id: Ibd324b781c84318c994e3742bb82e1d1393b94e4
2022-06-02 19:02:12 +08:00
parent 1ef5a1c86a
commit 64430ba2d2
4 changed files with 159 additions and 28 deletions
--- a/src/com/android/settings/network/SubscriptionUtil.java
+++ b/src/com/android/settings/network/SubscriptionUtil.java
@@ -479,7 +479,7 @@ public class SubscriptionUtil {
                .stream()
                .filter(subInfo -> subInfo.getSubscriptionId() == subId)
                .findFirst()
-                .get();
+                .orElse(null);
    }

    /**