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

Commit 38e03960 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Fix Telecom ConnectionTest." into rvc-dev am: 0ea5bf3d am: c84735f4 am: a514451d 

Change-Id: I90e4c426471a768b55061960fb93d056b391391a
parents 449db9d7 a514451d

telecomm/java/android/telecom/Connection.java

+1 −1
Original line number Diff line number Diff line
@@ -2331,7 +2331,6 @@ public abstract class Connection extends Conferenceable { 
     *        See {@link TelecomManager} for valid values.

     */

    public final void setAddress(Uri address, int presentation) {

        checkImmutable();

        Log.d(this, "setAddress %s", address);

        mAddress = address;

        mAddressPresentation = presentation;
@@ -3358,6 +3357,7 @@ public abstract class Connection extends Conferenceable { 
        private boolean mImmutable = false;

        public FailureSignalingConnection(DisconnectCause disconnectCause) {

            setDisconnected(disconnectCause);

            mImmutable = true;

        }



        public void checkImmutable() {