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

Merge "API Cleanup - rename IConferenceable to Conferenceable."

Browse Source
This commit is contained in:
Tyler Gunn
2015-04-20 20:12:43 +00:00
committed by Android (Google) Code Review
parent 7a0fe44d6a df2cbc8989
commit 4cf116ff20
7 changed files with 59 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
telecomm/java/android/telecom/ConnectionService.java
View File

@@ -539,7 +539,7 @@ public abstract class ConnectionService extends Service {
@Override
public void onConferenceablesChanged(
Connection connection, List<IConferenceable> conferenceables) {
Connection connection, List<Conferenceable> conferenceables) {
mAdapter.setConferenceableConnections(
mIdByConnection.get(connection),
createIdList(conferenceables));
@@ -1168,14 +1168,14 @@ public abstract class ConnectionService extends Service {
/**
* Builds a list of {@link Connection} and {@link Conference} IDs based on the list of
* {@link IConferenceable}s passed in.
* {@link Conferenceable}s passed in.
*
* @param conferenceables The {@link IConferenceable} connections and conferences.
* @param conferenceables The {@link Conferenceable} connections and conferences.
* @return List of string conference and call Ids.
*/
private List<String> createIdList(List<IConferenceable> conferenceables) {
private List<String> createIdList(List<Conferenceable> conferenceables) {
List<String> ids = new ArrayList<>();
for (IConferenceable c : conferenceables) {
for (Conferenceable c : conferenceables) {
// Only allow Connection and Conference conferenceables.
if (c instanceof Connection) {
Connection connection = (Connection) c;