commit 0a83a3500d9ed496ea410ff2fe9127b8d701d7f0
author Nancy Chen <nancychen@google.com> Mon Sep 08 17:39:03 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Sep 08 17:39:04 2014 +0000
tree 1c8786120fb9ccf479df0d766373142f8e624e19
parent e01a616d913892271d3ed25cb0bb6a938ad245f4
parent c2d0e8c8aaac5ec4ad394c5824f6c3265f751977

Merge "getHandle -> getAddress (ConnectionRequest)." into lmp-dev

sip/src/com/android/services/telephony/sip/SipConnectionService.java

diff --git a/sip/src/com/android/services/telephony/sip/SipConnectionService.java b/sip/src/com/android/services/telephony/sip/SipConnectionService.java
index ffaf64d..b12709b 100644
--- a/sip/src/com/android/services/telephony/sip/SipConnectionService.java
+++ b/sip/src/com/android/services/telephony/sip/SipConnectionService.java
@@ -88,7 +88,7 @@
 
 
         final SipConnection connection = new SipConnection();
-        connection.setHandle(request.getHandle(), PropertyPresentation.ALLOWED);
+        connection.setHandle(request.getAddress(), PropertyPresentation.ALLOWED);
         connection.setInitializing();
         connection.onAddedToCallService();
         boolean attemptCall = true;
@@ -265,7 +265,7 @@
 
     private com.android.internal.telephony.Connection startCallWithPhone(
             SipPhone phone, ConnectionRequest request) {
-        String number = request.getHandle().getSchemeSpecificPart();
+        String number = request.getAddress().getSchemeSpecificPart();
         if (VERBOSE) log("startCallWithPhone, number: " + number);
 
         try {

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 5d96665..29e78fa 100644
--- a/src/com/android/services/telephony/TelephonyConnectionService.java
+++ b/src/com/android/services/telephony/TelephonyConnectionService.java
@@ -65,7 +65,7 @@
             final ConnectionRequest request) {
         Log.i(this, "onCreateOutgoingConnection, request: " + request);
 
-        Uri handle = request.getHandle();
+        Uri handle = request.getAddress();
         if (handle == null) {
             Log.d(this, "onCreateOutgoingConnection, handle is null");
             return Connection.createFailedConnection(DisconnectCause.NO_PHONE_NUMBER_SUPPLIED,