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

am cac65feb: am f0affc6d: Merge "Correctly hide setConnectionService" into mnc-dev

Browse Source 
* commit 'cac65febb7bf50f0bc03d897ebbafa8347c0de31':
  Correctly hide setConnectionService
This commit is contained in:
Yorke Lee
2015-08-06 01:57:49 +00:00
committed by Android Git Automerger
parent 0e0d254c4a cac65febb7
commit 7be1e28641
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 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);

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 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);

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

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