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

Commit 5f18cce7 authored by Grant Menke's avatar Grant Menke Committed by Android (Google) Code Review
Browse files

Merge "Ensure Conference/Connection are initialzed with valid number presentation." into main

parents ac9181e1 e264714c

telecomm/java/android/telecom/Conference.java

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ public abstract class Conference extends Conferenceable { 
    private Set<String> mPreviousExtraKeys;

    private final Object mExtrasLock = new Object();

    private Uri mAddress;

    private int mAddressPresentation;

    private int mAddressPresentation = TelecomManager.PRESENTATION_UNKNOWN;

    private String mCallerDisplayName;

    private int mCallerDisplayNamePresentation;

    private int mCallDirection;

telecomm/java/android/telecom/Connection.java

+1 −1
Original line number Diff line number Diff line
@@ -2164,7 +2164,7 @@ public abstract class Connection extends Conferenceable { 
    private CallAudioState mCallAudioState;

    private CallEndpoint mCallEndpoint;

    private Uri mAddress;

    private int mAddressPresentation;

    private int mAddressPresentation = TelecomManager.PRESENTATION_UNKNOWN;

    private String mCallerDisplayName;

    private int mCallerDisplayNamePresentation;

    private boolean mRingbackRequested = false;