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 automerge: a0fc9f2

Browse Source 
automerge: 11603be

* commit '11603bebfad30ed0cf0f4abbfd7817bc81b40c5e':
  IMS: Set phone account in IMS Conference object
This commit is contained in:
Pavel Zhamaitsiak
2014-12-18 02:01:20 +00:00
committed by android-build-merger
parent 874d0c61e3 11603bebfa
commit cb4ffae80d
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 =
Collections.unmodifiableList(mConferenceableConnections);
private PhoneAccountHandle mPhoneAccount;
protected PhoneAccountHandle mPhoneAccount;
private AudioState mAudioState;
private int mState = Connection.STATE_NEW;
private DisconnectCause mDisconnectCause;