Merge "Add null check for call handle" into pi-dev
diff --git a/src/com/android/server/telecom/CallsManager.java b/src/com/android/server/telecom/CallsManager.java
index da49a73..497a3b0 100644
--- a/src/com/android/server/telecom/CallsManager.java
+++ b/src/com/android/server/telecom/CallsManager.java
@@ -2852,11 +2852,13 @@
return false;
}
- // Disconnected the live call if the outgoing call is an emergency call.
- if (isEmergency && !canHold(liveCall)) {
+ // If we have the max number of held managed calls and we're placing an emergency call,
+ // we'll disconnect the ongoing call if it cannot be held.
+ if (hasMaximumManagedHoldingCalls(call) && isEmergency && !canHold(liveCall)) {
call.getAnalytics().setCallIsAdditional(true);
liveCall.getAnalytics().setCallIsInterrupted(true);
- liveCall.disconnect("emergency, can't hold");
+ liveCall.disconnect("disconnecting to make room for emergency call "
+ + call.getId());
return true;
}