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

Commit f0affc6d authored by Yorke Lee's avatar Yorke Lee Committed by Android (Google) Code Review
Browse files

Merge "Correctly hide setConnectionService" into mnc-dev

parents 2c1a22d9 5346396b

api/current.txt

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

    method public final void setConferenceables(java.util.List<android.telecom.Conferenceable>);

    method public final void setConnectionCapabilities(int);

    method public final void setConnectionService(android.telecom.ConnectionService);

    method public final void setDialing();

    method public final void setDisconnected(android.telecom.DisconnectCause);

    method public final void setExtras(android.os.Bundle);

api/system-current.txt

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

    method public final void setConferenceables(java.util.List<android.telecom.Conferenceable>);

    method public final void setConnectionCapabilities(int);

    method public final void setConnectionService(android.telecom.ConnectionService);

    method public final void setDialing();

    method public final void setDisconnected(android.telecom.DisconnectCause);

    method public final void setExtras(android.os.Bundle);

telecomm/java/android/telecom/Connection.java

+1 −1
Original line number Diff line number Diff line
@@ -1588,7 +1588,7 @@ public abstract class Connection extends Conferenceable { 
        return mUnmodifiableConferenceables;

    }



    /*

    /**

     * @hide

     */

    public final void setConnectionService(ConnectionService connectionService) {