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

Commit a81e9f82 authored by Santos Cordon's avatar Santos Cordon Committed by Android Git Automerger
Browse files

am 05bbcb84: am 100ca8d8: am 115cdd48: Merge "Fix build break." into mnc-dev 

* commit '05bbcb84':
  Fix build break.
parents b51678b9 05bbcb84

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -32191,7 +32191,7 @@ package android.telecom { 
    method public final java.util.List<android.telecom.Connection> getConnections();

    method public final android.telecom.DisconnectCause getDisconnectCause();

    method public final android.telecom.PhoneAccountHandle getPhoneAccountHandle();

    method public final android.telecom.Connection getPrimaryConnection();

    method public android.telecom.Connection getPrimaryConnection();

    method public final int getState();

    method public final android.telecom.StatusHints getStatusHints();

    method public android.telecom.Connection.VideoProvider getVideoProvider();

telecomm/java/android/telecom/Conference.java

+1 −1
Original line number Diff line number Diff line
@@ -462,7 +462,7 @@ public abstract class Conference implements Conferenceable { 
     * @hide

     */

    @SystemApi

    public final Connection getPrimaryConnection() {

    public Connection getPrimaryConnection() {

        if (mUnmodifiableChildConnections == null || mUnmodifiableChildConnections.isEmpty()) {

            return null;

        }