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

Commit 04f0524a authored by Yorke Lee's avatar Yorke Lee Committed by Android Git Automerger
Browse files

am 25f9f7a4: am e80dbaeb: am 7be1e286: am cac65feb: am f0affc6d: Merge... 

am 25f9f7a4: am e80dbaeb: am 7be1e286: am cac65feb: am f0affc6d: Merge "Correctly hide setConnectionService" into mnc-dev

* commit '25f9f7a4':
  Correctly hide setConnectionService
parents bdeb3869 25f9f7a4

api/current.txt

+0 −1
Original line number Diff line number Diff line
@@ -30114,7 +30114,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
@@ -32316,7 +32316,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) {