merge from master

Change-Id: Ic03669db3f4595336a7dbc13ffc77d055d11acf9

telecomm/java/android/telecom/Conference.java

@@ -65,6 +65,7 @@ public abstract class Conference extends Conferenceable {
     private final List<Connection> mUnmodifiableConferenceableConnections =
             Collections.unmodifiableList(mConferenceableConnections);
 
+    private String mTelecomCallId;
     private PhoneAccountHandle mPhoneAccount;
     private CallAudioState mCallAudioState;
     private int mState = Connection.STATE_NEW;
@@ -93,6 +94,26 @@ public abstract class Conference extends Conferenceable {
         mPhoneAccount = phoneAccount;
     }
 
+    /**
+     * Returns the telecom internal call ID associated with this conference.
+     *
+     * @return The telecom call ID.
+     * @hide
+     */
+    public final String getTelecomCallId() {
+        return mTelecomCallId;
+    }
+
+    /**
+     * Sets the telecom internal call ID associated with this conference.
+     *
+     * @param telecomCallId The telecom call ID.
+     * @hide
+     */
+    public final void setTelecomCallId(String telecomCallId) {
+        mTelecomCallId = telecomCallId;
+    }
+
     /**
      * Returns the {@link PhoneAccountHandle} the conference call is being placed through.
      *