commit c7ae925111e0f9390bb84d47e3cf44f86f7e2235
author Hall Liu <hallliu@google.com> Mon Oct 21 14:51:20 2019 -0700
committer Hall Liu <hallliu@google.com> Tue Oct 22 18:24:44 2019 -0700
tree 54df19e5773c8a0832ea6acee18bd14434f64942
parent cc0ef9cd4e9a9cc05d34db9bfa7131b1ec6015bf

Add delay for hanging up number verification call

Add a 10 second delay before hanging up a call that was caught by the
number verification checker. This is so that the call doesn't end up
going to voicemail after the device hangs up.

Bug: 142721516
Test: manual, TelephonyManagerTestApp
Change-Id: Ic0832356e19cfd8e3d6deb8ee030d7c69c598e21

src/com/android/services/telephony/PstnIncomingCallNotifier.java

diff --git a/src/com/android/services/telephony/PstnIncomingCallNotifier.java b/src/com/android/services/telephony/PstnIncomingCallNotifier.java
index 223616f..a2ced9e 100644
--- a/src/com/android/services/telephony/PstnIncomingCallNotifier.java
+++ b/src/com/android/services/telephony/PstnIncomingCallNotifier.java
@@ -54,6 +54,14 @@
     private static final int EVENT_CDMA_CALL_WAITING = 101;
     private static final int EVENT_UNKNOWN_CONNECTION = 102;
 
+    /**
+     * The max amount of time to wait before hanging up a call that was for number verification.
+     *
+     * The delay is so that the remote end has time to hang up the call after receiving the
+     * verification signal so that the call doesn't go to voicemail.
+     */
+    private static final int MAX_NUMBER_VERIFICATION_HANGUP_DELAY_MILLIS = 10000;
+
     /** The phone object to listen to. */
     private final Phone mPhone;
 
@@ -131,12 +139,16 @@
             if (connection.getAddress() != null) {
                 if (NumberVerificationManager.getInstance()
                         .checkIncomingCall(connection.getAddress())) {
-                    // Disconnect the call if it matches
-                    try {
-                        connection.hangup();
-                    } catch (CallStateException e) {
-                        Log.e(this, e, "Error hanging up potential number verification call");
-                    }
+                    // Disconnect the call if it matches, after a delay
+                    mHandler.postDelayed(() -> {
+                        try {
+                            connection.hangup();
+                        } catch (CallStateException e) {
+                            Log.i(this, "Remote end hung up call verification call");
+                        }
+                        // TODO: use an app-supplied delay (needs new API), not to exceed the
+                        // existing max.
+                    }, MAX_NUMBER_VERIFICATION_HANGUP_DELAY_MILLIS);
                     return;
                 }
             }