commit 5a2a0c27ee4c3d6c7ad03233accf44d6ec34b242
author Jay Shrauner <shrauner@google.com> Tue Apr 14 15:34:10 2015 -0700
committer Jay Shrauner <shrauner@google.com> Tue Apr 14 17:04:08 2015 -0700
tree e606d1d509200a96a41e4853ab5acc3c9acb002c
parent e95cbd5c6b790afb0abd601f0809f30daa38ffd6

Merge fixups

Remove redundant lines from merge. Don't use old deprecated versions of APIs.

Bug:
Change-Id: I136136939cacf6400fa7bea3d644eb8ab4dce13e

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

diff --git a/src/com/android/services/telephony/ImsConference.java b/src/com/android/services/telephony/ImsConference.java
index ced36a1..9df90e8 100644
--- a/src/com/android/services/telephony/ImsConference.java
+++ b/src/com/android/services/telephony/ImsConference.java
@@ -168,7 +168,7 @@
         public void onConnectionCapabilitiesChanged(Connection c, int connectionCapabilities) {
             Log.d(this, "onCallCapabilitiesChanged: Connection: %s, callCapabilities: %s", c,
                     connectionCapabilities);
-            int capabilites = ImsConference.this.getCapabilities();
+            int capabilites = ImsConference.this.getConnectionCapabilities();
             setCapabilities(applyVideoCapabilities(capabilites, connectionCapabilities));
         }
     };
@@ -213,23 +213,11 @@
 
         mTelephonyConnectionService = telephonyConnectionService;
         setConferenceHost(conferenceHost);
-        setConnectionCapabilities(
-                Connection.CAPABILITY_SUPPORT_HOLD |
-                Connection.CAPABILITY_HOLD |
-                Connection.CAPABILITY_MUTE
-        );
-
-        if (conferenceHost != null && conferenceHost.getCall() != null
-                && conferenceHost.getCall().getPhone() != null) {
-            mPhoneAccount = PhoneUtils.makePstnPhoneAccountHandle(
-                    conferenceHost.getCall().getPhone());
-            Log.v(this, "set phacc to " + mPhoneAccount);
-        }
 
         int capabilities = Connection.CAPABILITY_SUPPORT_HOLD | Connection.CAPABILITY_HOLD |
                 Connection.CAPABILITY_MUTE;
 
-        capabilities = applyVideoCapabilities(capabilities, mConferenceHost.getCallCapabilities());
+        capabilities = applyVideoCapabilities(capabilities, mConferenceHost.getConnectionCapabilities());
         setConnectionCapabilities(capabilities);
 
     }