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

Change-Id: I75fa482e39687f522e66303b1f865c9493ed273d
This commit is contained in:
Automerger Merge Worker
2020-03-07 00:19:36 +00:00

View File

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