From 71bf7e4d449fa28a644658b01029b7475a4a4162 Mon Sep 17 00:00:00 2001 From: yueg Date: Mon, 30 Apr 2018 12:00:48 -0700 Subject: Bubble changes for background calling. Bug: 74022483 Test: manual PiperOrigin-RevId: 194822680 Change-Id: I4df144b21a0fc32e39eb970fadc24ef7eb6e7199 --- java/com/android/incallui/InCallPresenter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'java/com/android/incallui/InCallPresenter.java') diff --git a/java/com/android/incallui/InCallPresenter.java b/java/com/android/incallui/InCallPresenter.java index 8193c6e05..3020bf1fa 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; } -- cgit v1.2.3 From 2e36647b63e859c299d8242736226c00071836d9 Mon Sep 17 00:00:00 2001 From: yueg Date: Mon, 30 Apr 2018 18:08:44 -0700 Subject: Don't start emergency call in background calling mode. Bug: 74022483 Test: InCallPresenterTest PiperOrigin-RevId: 194877539 Change-Id: If140d716a8019738e145c24cbaab3c03827662cb --- java/com/android/incallui/InCallPresenter.java | 3 +++ 1 file changed, 3 insertions(+) (limited to 'java/com/android/incallui/InCallPresenter.java') diff --git a/java/com/android/incallui/InCallPresenter.java b/java/com/android/incallui/InCallPresenter.java index 3020bf1fa..ccc564806 100644 --- a/java/com/android/incallui/InCallPresenter.java +++ b/java/com/android/incallui/InCallPresenter.java @@ -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); -- cgit v1.2.3