Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: Id7ef167b3f3275703ee880abe5cf0b58404f602d
This commit is contained in:
Automerger Merge Worker
2020-03-07 00:27:58 +00:00
parent 007a747d5a a10747d217
commit 771ae317fc
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
telecomm/java/android/telecom/Connection.java
View File

@@ -2331,7 +2331,6 @@ public abstract class Connection extends Conferenceable {
* See {@link TelecomManager} for valid values. * See {@link TelecomManager} for valid values.
*/ */
public final void setAddress(Uri address, int presentation) { public final void setAddress(Uri address, int presentation) {
checkImmutable();
Log.d(this, "setAddress %s", address); Log.d(this, "setAddress %s", address);
mAddress = address; mAddress = address;
mAddressPresentation = presentation; mAddressPresentation = presentation;
@@ -3358,6 +3357,7 @@ public abstract class Connection extends Conferenceable {
private boolean mImmutable = false; private boolean mImmutable = false;
public FailureSignalingConnection(DisconnectCause disconnectCause) { public FailureSignalingConnection(DisconnectCause disconnectCause) {
setDisconnected(disconnectCause); setDisconnected(disconnectCause);
mImmutable = true;
} }
public void checkImmutable() { public void checkImmutable() {