Merge changes If140d716,I89a186fa,Iee4e5c09,I5df97f0c,I55f75dc3, ...

* changes:
  Don't start emergency call in background calling mode.
  Make call configuration package visibility public.
  Don't save transcript if it's empty.
  Cancel all legacy voicemail notification when SIMs are removed on multi-SIM devices
  Fix bug that transcript button is visible for voice call.
  Refactor PreferredAccountWorker to provide the dialog to be shown.
  Fix bug that displaying local message is not in sync.
  Don't show dialog if in call activity is not visible.
  Bubble changes for background calling.
  Store RTT transcript message received when UI is in background.
  Update RTT transcript advisory text.
  Implement "Add to favorites" option in suggestions menu.

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