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

Change-Id: I7556a175cad8c896fcfa8a9d18e4ad90635277c3
2020-03-07 00:04:21 +00:00
parent 48ef8bda84 0ea5bf3ddf
commit ab9d09ec88
1 changed files with 1 additions and 1 deletions
--- a/telecomm/java/android/telecom/Connection.java
+++ b/telecomm/java/android/telecom/Connection.java
@@ -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() {