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

Merge "Correctly hide setConnectionService" into mnc-dev

Browse Source
This commit is contained in:
Yorke Lee
2015-08-05 22:13:07 +00:00
committed by Android (Google) Code Review
parent 2c1a22d916 5346396ba2
commit f0affc6d46
3 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -30091,7 +30091,6 @@ package android.telecom {
method public final void setConferenceableConnections(java.util.List<android.telecom.Connection>); 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 setConferenceables(java.util.List<android.telecom.Conferenceable>);
method public final void setConnectionCapabilities(int); method public final void setConnectionCapabilities(int);
method public final void setConnectionService(android.telecom.ConnectionService);
method public final void setDialing(); method public final void setDialing();
method public final void setDisconnected(android.telecom.DisconnectCause); method public final void setDisconnected(android.telecom.DisconnectCause);
method public final void setExtras(android.os.Bundle); method public final void setExtras(android.os.Bundle);

1
api/system-current.txt
View File

@@ -32276,7 +32276,6 @@ package android.telecom {
method public final void setConferenceableConnections(java.util.List<android.telecom.Connection>); 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 setConferenceables(java.util.List<android.telecom.Conferenceable>);
method public final void setConnectionCapabilities(int); method public final void setConnectionCapabilities(int);
method public final void setConnectionService(android.telecom.ConnectionService);
method public final void setDialing(); method public final void setDialing();
method public final void setDisconnected(android.telecom.DisconnectCause); method public final void setDisconnected(android.telecom.DisconnectCause);
method public final void setExtras(android.os.Bundle); method public final void setExtras(android.os.Bundle);

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

@@ -1588,7 +1588,7 @@ public abstract class Connection extends Conferenceable {
return mUnmodifiableConferenceables; return mUnmodifiableConferenceables;
} }
/* /**
* @hide * @hide
*/ */
public final void setConnectionService(ConnectionService connectionService) { public final void setConnectionService(ConnectionService connectionService) {