commit 56b3d75967ea477d383998764216e5c6fcabc037
author Brad Ebinger <breadley@google.com> Wed Oct 17 16:58:10 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Oct 17 16:58:10 2018 +0000
tree 04f943c17c0194ccb41179cf3bc57934b84b2ea2
parent 42c4502bc813b45e3991f307f14630cdbdda4236
parent cbffc32eb5725d3b766cbae0befe49e5645db149

Merge "Use phoneId instead of SimSlotIndex"

src/com/android/phone/MobileNetworkSettings.java

diff --git a/src/com/android/phone/MobileNetworkSettings.java b/src/com/android/phone/MobileNetworkSettings.java
index 3d37c4d..c95505f 100644
--- a/src/com/android/phone/MobileNetworkSettings.java
+++ b/src/com/android/phone/MobileNetworkSettings.java
@@ -245,7 +245,8 @@
         // active subscriptions.
         if (sil != null) {
             for (SubscriptionInfo subInfo : sil) {
-                ImsManager imsManager = ImsManager.getInstance(context, subInfo.getSimSlotIndex());
+                int phoneId = SubscriptionManager.getPhoneId(subInfo.getSubscriptionId());
+                ImsManager imsManager = ImsManager.getInstance(context, phoneId);
                 PersistableBundle carrierConfig = carrierConfigManager.getConfigForSubId(
                         subInfo.getSubscriptionId());
                 if ((imsManager.isVolteEnabledByPlatform()