Snap for 8389413 from 59a4c013191396967d9ac817509d92682310215d to s-keystone-qcom-release

Change-Id: Iaf258a20706c4c9212154eaf32d79070acd9da12

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();