Settings: fix default sim radio selections

Change-Id: I8ba32f3b203751e79697c7dcbc2cfcf1c6ae4ad0
Ticket: CYNGNOS-2388, CYNGNOS-2212
Signed-off-by: Roman Birg <roman@cyngn.com>

1 files changed, 3 insertions, 4 deletions

diff --git a/src/com/android/settings/sim/SimDialogActivity.java b/src/com/android/settings/sim/SimDialogActivity.java
index 0b73d65..fe6642e 100644
--- a/src/com/android/settings/sim/SimDialogActivity.java
+++ b/src/com/android/settings/sim/SimDialogActivity.java
@@ -238,7 +238,7 @@ public class SimDialogActivity extends Activity {
                 }
             };
 
-        int currentIndex = -1;
+        int currentIndex = 0;
         ArrayList<SubscriptionInfo> callsSubInfoList = new ArrayList<SubscriptionInfo>();
         if (id == CALLS_PICK) {
             final TelecomManager telecomManager = TelecomManager.from(context);
@@ -295,7 +295,7 @@ public class SimDialogActivity extends Activity {
                 }
             }
         } else {
-            SubscriptionInfo defaultSub = subscriptionManager.getDefaultDataSubscriptionInfo();
+            final int defaultDataSubId = SubscriptionManager.getDefaultDataSubId();
             for (int i = 0; i < selectableSubInfoLength; ++i) {
                 final SubscriptionInfo sir = subInfoList.get(i);
                 CharSequence displayName = sir.getDisplayName();
@@ -303,8 +303,7 @@ public class SimDialogActivity extends Activity {
                     displayName = "";
                 }
                 list.add(displayName.toString());
-                if (defaultSub != null && defaultSub.getSubscriptionId()
-                        == sir.getSubscriptionId()) {
+                if (defaultDataSubId == sir.getSubscriptionId()) {
                     currentIndex = list.size() - 1;
                 }
             }