Merge "Gaurd code to catch NPE of satellite controller and returning empty list" into main
diff --git a/src/com/android/services/telephony/TelephonyConnectionService.java b/src/com/android/services/telephony/TelephonyConnectionService.java
index 457e8f8..8c0a5e7 100644
--- a/src/com/android/services/telephony/TelephonyConnectionService.java
+++ b/src/com/android/services/telephony/TelephonyConnectionService.java
@@ -1366,7 +1366,11 @@
}
return resultConnection;
} else {
- if (mTelephonyManagerProxy.isConcurrentCallsPossible()) {
+ // If call sequencing is enabled, Telecom will take care of holding calls across
+ // subscriptions if needed before delegating the connection creation over to
+ // Telephony.
+ if (mTelephonyManagerProxy.isConcurrentCallsPossible()
+ && !mTelecomFlags.enableCallSequencing()) {
Conferenceable c = maybeHoldCallsOnOtherSubs(request.getAccountHandle());
if (c != null) {
delayDialForOtherSubHold(phone, c, (success) -> {