commit b2fe86674bf81fe60133869a03c9d4aa0bf85f0a
author Ihab Awad <ihab@google.com> Fri Jul 25 17:32:43 2014 -0700
committer Ihab Awad <ihab@google.com> Tue Jul 29 14:37:51 2014 -0700
tree ac4a6cec8f92208e936af615475f796c7a7df13d
parent e355941decedf2718b8d45abcb5dd58c0c098379

Connection creation and service wiring for WiFi call managers (3/3)

Bug: 16469413
Change-Id: I17a1062c48d59865708cdcfb8f570257223a209a

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 adbb624..5aaa20c 100644
--- a/sip/src/com/android/services/telephony/sip/SipConnectionService.java
+++ b/sip/src/com/android/services/telephony/sip/SipConnectionService.java
@@ -48,6 +48,7 @@
 
     @Override
     public Connection onCreateOutgoingConnection(
+            PhoneAccountHandle connectionManagerAccount,
             final ConnectionRequest request) {
         if (VERBOSE) log("onCreateOutgoingConnection, request: " + request);
 
@@ -95,6 +96,7 @@
 
     @Override
     public Connection onCreateIncomingConnection(
+            PhoneAccountHandle connectionManagerAccount,
             ConnectionRequest request) {
         if (VERBOSE) log("onCreateIncomingConnection, request: " + request);
 

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

diff --git a/src/com/android/services/telephony/TelecommAccountRegistry.java b/src/com/android/services/telephony/TelecommAccountRegistry.java
index 2b42d0f..d40e9af 100644
--- a/src/com/android/services/telephony/TelecommAccountRegistry.java
+++ b/src/com/android/services/telephony/TelecommAccountRegistry.java
@@ -97,8 +97,7 @@
                             PhoneAccount.CAPABILITY_CALL_PROVIDER,
                     com.android.phone.R.mipmap.ic_launcher_phone,
                     label,
-                    description,
-                    true /* supportsVideoCalling */);
+                    description);
 
             // Register with Telecomm and put into the account entry.
             mTelecommManager.registerPhoneAccount(account);

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 ae4f5da..e151716 100644
--- a/src/com/android/services/telephony/TelephonyConnectionService.java
+++ b/src/com/android/services/telephony/TelephonyConnectionService.java
@@ -56,6 +56,7 @@
 
     @Override
     public Connection onCreateOutgoingConnection(
+            PhoneAccountHandle connectionManagerPhoneAccount,
             final ConnectionRequest request) {
         Log.v(this, "onCreateOutgoingConnection, request: " + request);
 
@@ -156,6 +157,7 @@
 
     @Override
     public Connection onCreateIncomingConnection(
+            PhoneAccountHandle connectionManagerPhoneAccount,
             ConnectionRequest request) {
         Log.v(this, "onCreateIncomingConnection, request: " + request);
 
@@ -191,19 +193,6 @@
         }
     }
 
-    @Override
-    public void onConnectionAdded(Connection connection) {
-        Log.v(this, "onConnectionAdded, connection: " + connection);
-    }
-
-    @Override
-    public void onConnectionRemoved(Connection connection) {
-        Log.v(this, "onConnectionRemoved, connection: " + connection);
-        if (connection instanceof TelephonyConnection) {
-            ((TelephonyConnection) connection).onRemovedFromCallService();
-        }
-    }
-
     private Connection startOutgoingCall(
             ConnectionRequest request,
             Phone phone,