diff options
author | Tyler Gunn <tgunn@google.com> | 2015-04-20 20:12:43 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-20 20:12:47 +0000 |
commit | 4cf116ff20f143136ea69a8522fc01ef8a1e7f85 (patch) | |
tree | 1b3a42b717c56e2498381faebfbbca8438279980 /telecomm/java/android/telecom/ConnectionService.java | |
parent | 7a0fe44d6a4d3ffcc2803694c544b794b4d40342 (diff) | |
parent | df2cbc8989e624cd6a1d732549ea4a4f00852508 (diff) | |
download | frameworks_base-4cf116ff20f143136ea69a8522fc01ef8a1e7f85.zip frameworks_base-4cf116ff20f143136ea69a8522fc01ef8a1e7f85.tar.gz frameworks_base-4cf116ff20f143136ea69a8522fc01ef8a1e7f85.tar.bz2 |
Merge "API Cleanup - rename IConferenceable to Conferenceable."
Diffstat (limited to 'telecomm/java/android/telecom/ConnectionService.java')
-rw-r--r-- | telecomm/java/android/telecom/ConnectionService.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/telecomm/java/android/telecom/ConnectionService.java b/telecomm/java/android/telecom/ConnectionService.java index 73d1644..9812815 100644 --- a/telecomm/java/android/telecom/ConnectionService.java +++ b/telecomm/java/android/telecom/ConnectionService.java @@ -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; |