summaryrefslogtreecommitdiffstats
path: root/testapps
diff options
context:
space:
mode:
authorBrad Ebinger <breadley@google.com>2019-11-11 16:59:44 -0800
committerBrad Ebinger <breadley@google.com>2019-11-12 16:34:15 -0800
commit81e8a25abcd8b3a93c46bbcd86a156563edcd5ca (patch)
tree779ec34965650c2d6afaf96f2f81018d6ba0aa47 /testapps
parent29cbb62d00ffe65bf34ff1190e1ba0c7414b11c5 (diff)
downloadplatform_packages_services_Telecomm-81e8a25abcd8b3a93c46bbcd86a156563edcd5ca.tar.gz
platform_packages_services_Telecomm-81e8a25abcd8b3a93c46bbcd86a156563edcd5ca.tar.bz2
platform_packages_services_Telecomm-81e8a25abcd8b3a93c46bbcd86a156563edcd5ca.zip
Restrict calling in favor of emergency calling - Incoming Cases
The first series of CLs (1/2) that allow for better interactions between emergency calls and incoming call types. This includes: 1) Disconnecting incoming calls and marking them as MISSED if an outgoing emergency call is placed before the call is set to active. 2) Not allowing the pulling of external calls while an emergency call is active and showing a Toast. 3) If a call is in AUDIO_PROCESSING state, hang it up in favor of a new outgoing emergency call (and mark disconnected call as MISSED if this is during an initial call screen). 4) If a call is in SIMULATED_RINGING state, hang it up in favor of a new outgoing emergency call. Bug: 138741228 Test: manual; atest TelecomUnitTests; atest CtsTelecomTestCases Change-Id: I74d2b174121fb9c6402caf806d20eb6c5226873a
Diffstat (limited to 'testapps')
-rw-r--r--testapps/src/com/android/server/telecom/testapps/TestConnectionService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/testapps/src/com/android/server/telecom/testapps/TestConnectionService.java b/testapps/src/com/android/server/telecom/testapps/TestConnectionService.java
index 90509f680..f6fa11602 100644
--- a/testapps/src/com/android/server/telecom/testapps/TestConnectionService.java
+++ b/testapps/src/com/android/server/telecom/testapps/TestConnectionService.java
@@ -182,7 +182,7 @@ public class TestConnectionService extends ConnectionService {
setConnectionProperties(properties);
if (isIncoming) {
- Bundle newExtras = getExtras();
+ Bundle newExtras = (getExtras() == null) ? new Bundle() : getExtras();
newExtras.putBoolean(Connection.EXTRA_ANSWERING_DROPS_FG_CALL, true);
putExtras(newExtras);
}