commit b7b40e9d3fe161c339b67ef3c4a4aa9347fc5315
author Wink Saville <wink@google.com> Thu Dec 18 18:17:40 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Dec 18 18:17:40 2014 +0000
tree 5d044b0a6839d3e39eb3c2fecfe7157fad105fcc
parent 02539fd2cc054c322d7d26152e6455a373ba913c
parent ddb5d20f8bf79a464f4ec28e16941ab977c35331

Merge "Initialize mPhone to the phone in slot 0." into lmp-mr1-dev

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 528b65d..5a15a47 100644
--- a/src/com/android/services/telephony/ImsConference.java
+++ b/src/com/android/services/telephony/ImsConference.java
@@ -179,6 +179,13 @@
         super(null);
         mTelephonyConnectionService = telephonyConnectionService;
         setConferenceHost(conferenceHost);
+        if (conferenceHost != null && conferenceHost.getCall() != null
+                && conferenceHost.getCall().getPhone() != null) {
+            mPhoneAccount = PhoneUtils.makePstnPhoneAccountHandle(
+                    conferenceHost.getCall().getPhone());
+            Log.v(this, "set phacc to " + mPhoneAccount);
+        }
+
         setConnectionCapabilities(
                 Connection.CAPABILITY_SUPPORT_HOLD |
                 Connection.CAPABILITY_HOLD |