commit 54188d12b8d216c4d38390c58dcc5308bbf9696b
author Evan Charlton <evanc@google.com> Thu Jun 05 22:45:53 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jun 05 22:45:53 2014 +0000
tree 45176322c391934ec1aa9792c558dd1cff088e0b
parent e57a72300045d5cc61eb686ba5ed93b21de58754
parent 95bd113528105350c09b173bace79f405174da48

Merge "Use the new DTMF post-dial APIs" into lmp-preview-dev

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

diff --git a/src/com/android/services/telephony/PstnConnection.java b/src/com/android/services/telephony/PstnConnection.java
index 6f2c07f..b11c9d0 100644
--- a/src/com/android/services/telephony/PstnConnection.java
+++ b/src/com/android/services/telephony/PstnConnection.java
@@ -95,6 +95,15 @@
         super.onDisconnect();
     }
 
+    @Override
+    public void onPostDialContinue(boolean proceed) {
+        if (proceed) {
+            getOriginalConnection().proceedAfterWaitChar();
+        } else {
+            getOriginalConnection().cancelPostDial();
+        }
+    }
+
     protected Phone getPhone() {
         return mPhone;
     }

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

diff --git a/src/com/android/services/telephony/PstnConnectionService.java b/src/com/android/services/telephony/PstnConnectionService.java
index 8ac6ee9..21ee41c 100644
--- a/src/com/android/services/telephony/PstnConnectionService.java
+++ b/src/com/android/services/telephony/PstnConnectionService.java
@@ -19,14 +19,14 @@
 import android.net.Uri;
 
 import android.telephony.DisconnectCause;
+import android.telecomm.Connection;
+import android.telecomm.ConnectionRequest;
+import android.telecomm.Response;
 import android.telephony.PhoneNumberUtils;
 
 import com.android.internal.telephony.Call;
 import com.android.internal.telephony.Phone;
 import com.android.phone.Constants;
-import android.telecomm.Connection;
-import android.telecomm.ConnectionRequest;
-import android.telecomm.Response;
 
 import java.util.HashSet;
 import java.util.Set;

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

diff --git a/src/com/android/services/telephony/TelephonyConnectionService.java b/src/com/android/services/telephony/TelephonyConnectionService.java
index c17b8f6..76d4291 100644
--- a/src/com/android/services/telephony/TelephonyConnectionService.java
+++ b/src/com/android/services/telephony/TelephonyConnectionService.java
@@ -22,6 +22,7 @@
 import android.text.TextUtils;
 
 import com.android.internal.telephony.CallStateException;
+import com.android.internal.telephony.Connection.PostDialListener;
 import com.android.internal.telephony.Phone;
 
 import android.telecomm.Connection;
@@ -125,7 +126,19 @@
         }
 
         try {
-            respondWithResult(request, response, createTelephonyConnection(request, connection));
+            final TelephonyConnection telephonyConnection =
+                    createTelephonyConnection(request, connection);
+            respondWithResult(request, response, telephonyConnection);
+
+            final com.android.internal.telephony.Connection connectionCopy = connection;
+            PostDialListener postDialListener = new PostDialListener() {
+                @Override
+                public void onPostDialWait() {
+                    TelephonyConnectionService.this.onPostDialWait(telephonyConnection,
+                            connectionCopy.getRemainingPostDialString());
+                }
+            };
+            connection.addPostDialListener(postDialListener);
         } catch (Exception e) {
             Log.e(this, e, "Call to createConnection failed with exception");
             respondWithError(
@@ -216,6 +229,7 @@
                 sKnownConnections.remove(connection);
             }
         });
+
         return telephonyConnection;
     }