Handle providing disconnect message through CallRedirectionService.

If a CDS is bound, then we will pass the disconnect cause on to the CDS
and wait up to 2 sec for it to potentially return an override disconnect
message.  If it does we override the telephony-provided disconnect cause
so that the message provided showed up in the Dialer app.

Test: Added CTS tests for these cases.
Test: Manual test with telecom test app.
Bug: 163085177
Change-Id: I8705c3b912e5277727a8dfca9e321b3856176ee9

1 files changed, 2 insertions, 2 deletions

diff --git a/testapps/src/com/android/server/telecom/testapps/TestCallDiagnosticService.java b/testapps/src/com/android/server/telecom/testapps/TestCallDiagnosticService.java
index 73bf43825..36554ec60 100644
--- a/testapps/src/com/android/server/telecom/testapps/TestCallDiagnosticService.java
+++ b/testapps/src/com/android/server/telecom/testapps/TestCallDiagnosticService.java
@@ -51,14 +51,14 @@ public class TestCallDiagnosticService extends CallDiagnosticService {
         @Override
         public CharSequence onCallDisconnected(int disconnectCause, int preciseDisconnectCause) {
             Log.i(this, "onCallDisconnected");
-            return null;
+            return "GSM/CDMA call dropped because " + disconnectCause;
         }
 
         @Nullable
         @Override
         public CharSequence onCallDisconnected(@NonNull ImsReasonInfo disconnectReason) {
             Log.i(this, "onCallDisconnected");
-            return null;
+            return "ImsCall dropped because something happened " + disconnectReason.mExtraMessage;
         }
 
         @Override