commit ca1bf467d9cf8bd090895781fc411fc97a681d88
author Treehugger Robot <treehugger-gerrit@google.com> Mon Jun 03 23:58:39 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jun 03 23:58:39 2019 +0000
tree 53ea5f44f4e0ca364acc38579bc43ab7f6577c05
parent f378a4017cc77d45e512e2e52b26d02a20015dc7
parent 42c90466b17346a42a5e5f92558cae35a96e4f7b

Merge "Do not wait for opportunistic sub to be IN SERVICE for test emergency"

src/com/android/services/telephony/TelephonyConnectionService.java

diff --git a/src/com/android/services/telephony/TelephonyConnectionService.java b/src/com/android/services/telephony/TelephonyConnectionService.java
index 0042ff5..4b29f4a 100644
--- a/src/com/android/services/telephony/TelephonyConnectionService.java
+++ b/src/com/android/services/telephony/TelephonyConnectionService.java
@@ -482,7 +482,10 @@
                         // it is a test emergency number and we have to wait for the device to move
                         // IN_SERVICE before the call can take place over normal routing.
                         return (phone.getState() == PhoneConstants.State.OFFHOOK)
-                            || serviceState == ServiceState.STATE_IN_SERVICE;
+                                // Do not wait for voice in service on opportunistic SIMs.
+                                || SubscriptionController.getInstance().isOpportunistic(
+                                        phone.getSubId())
+                                || serviceState == ServiceState.STATE_IN_SERVICE;
                     }
                 }
             });