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

Commit a10747d2 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

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

Change-Id: I75fa482e39687f522e66303b1f865c9493ed273d
parents 6a1aafd8 ab9d09ec

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() {