Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 3a359345: Merge "IMS: Set phone account in IMS Conference object" into lmp-mr1-dev

Browse Source 
automerge: a0fc9f2

* commit 'a0fc9f2dd1820611295c6f83efec60c2a8f37eee':
  IMS: Set phone account in IMS Conference object
This commit is contained in:
Pavel Zhamaitsiak
2014-12-18 01:55:06 +00:00
committed by android-build-merger
parent 8c3b1021ba a0fc9f2dd1
commit 11603bebfa
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
telecomm/java/android/telecom/Conference.java
View File

@@ -53,7 +53,7 @@ public abstract class Conference implements IConferenceable {
private final List<Connection> mUnmodifiableConferenceableConnections = private final List<Connection> mUnmodifiableConferenceableConnections =
Collections.unmodifiableList(mConferenceableConnections); Collections.unmodifiableList(mConferenceableConnections);
private PhoneAccountHandle mPhoneAccount; protected PhoneAccountHandle mPhoneAccount;
private AudioState mAudioState; private AudioState mAudioState;
private int mState = Connection.STATE_NEW; private int mState = Connection.STATE_NEW;
private DisconnectCause mDisconnectCause; private DisconnectCause mDisconnectCause;