Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 11603beb authored by Pavel Zhamaitsiak's avatar Pavel Zhamaitsiak Committed by android-build-merger
Browse files

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

automerge: a0fc9f2d

* commit 'a0fc9f2d':
  IMS: Set phone account in IMS Conference object
parents 8c3b1021 a0fc9f2d

telecomm/java/android/telecom/Conference.java

+1 −1
Original line number Diff line number Diff line
@@ -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;