Fix voice call preference changing to different slot

On a Subsidy lock enabled device, it is seen that till
the subsidy carrier sim latches to network, the other
sim stays in perso locked state, due to this subsidy
carrier sim always initialized first when compared to
non-subsidy sim. This is resulting in voice preference
getting set to subsidy carrier sim.

Change-Id: I6c387bc7309e149d77cc564a557eadf247e84938
CRs-Fixed: 3140714

1 files changed, 13 insertions, 1 deletions

diff --git a/src/com/android/services/telephony/TelecomAccountRegistry.java b/src/com/android/services/telephony/TelecomAccountRegistry.java
index 513072019a..290326ebc3 100644
--- a/src/com/android/services/telephony/TelecomAccountRegistry.java
+++ b/src/com/android/services/telephony/TelecomAccountRegistry.java
@@ -1734,7 +1734,8 @@ public class TelecomAccountRegistry {
             if ((defaultPhoneAccount == null)
                         && (mTelephonyManager.getActiveModemCount() > Count.ONE.ordinal())
                         && (activeCount == Count.ONE.ordinal())
-                        && (areAllSimAccountsFound()) && (isRadioInValidState(phones))) {
+                        && (areAllSimAccountsFound()) && (isRadioInValidState(phones))
+                        && !isSubIdCreationPending()) {
                 PhoneAccountHandle phoneAccountHandle =
                         subscriptionIdToPhoneAccountHandle(activeSubscriptionId);
                 if (phoneAccountHandle != null) {
@@ -1745,6 +1746,17 @@ public class TelecomAccountRegistry {
         }
     }
 
+    private boolean isSubIdCreationPending() {
+        Log.i(this, "isSubIdCreationPending");
+        SubscriptionController subController = SubscriptionController.getInstance();
+
+        if (subController == null) {
+            Log.i(this, "isSubIdCreationPending: SubscriptionController instance is null");
+            return false;
+        }
+        return subController.isSubIdCreationPending();
+    }
+
     private boolean areAllSimAccountsFound() {
         final Iterator<PhoneAccountHandle> phoneAccounts =
                 mTelecomManager.getCallCapablePhoneAccounts().listIterator();