1 files changed, 4 insertions, 1 deletions
diff --git a/java/com/android/incallui/InCallPresenter.java b/java/com/android/incallui/InCallPresenter.java
index 8193c6e05..ccc564806 100644
--- a/java/com/android/incallui/InCallPresenter.java
+++ b/java/com/android/incallui/InCallPresenter.java
@@ -414,7 +414,7 @@ public class InCallPresenter implements CallList.Listener, AudioModeProvider.Aud
    * Return whether we should start call in bubble mode and not show InCallActivity. The call mode
    * should be set in CallConfiguration in EXTRA_OUTGOING_CALL_EXTRAS when starting a call intent.
    */
-  private boolean shouldStartInBubbleMode() {
+  public boolean shouldStartInBubbleMode() {
     if (!ReturnToCallController.isEnabled(context)) {
       return false;
     }
@@ -427,6 +427,9 @@ public class InCallPresenter implements CallList.Listener, AudioModeProvider.Aud
     if (dialerCall == null) {
       return false;
     }
+    if (dialerCall.isEmergencyCall()) {
+      return false;
+    }
 
     Bundle extras = dialerCall.getIntentExtras();
     boolean result = shouldStartInBubbleModeWithExtras(extras);