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

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

@@ -44,7 +44,7 @@ import java.util.concurrent.ConcurrentHashMap;
* must call {@link #destroy()} to signal to the framework that the {@code Connection} is no
* longer used and associated resources may be recovered.
*/
public abstract class Connection implements IConferenceable {
public abstract class Connection implements Conferenceable {
public static final int STATE_INITIALIZING = 0;
@@ -332,7 +332,7 @@ public abstract class Connection implements IConferenceable {
public void onAudioModeIsVoipChanged(Connection c, boolean isVoip) {}
public void onStatusHintsChanged(Connection c, StatusHints statusHints) {}
public void onConferenceablesChanged(
Connection c, List<IConferenceable> conferenceables) {}
Connection c, List<Conferenceable> conferenceables) {}
public void onConferenceChanged(Connection c, Conference conference) {}
/** @hide */
public void onConferenceParticipantsChanged(Connection c,
@@ -745,8 +745,8 @@ public abstract class Connection implements IConferenceable {
*/
private final Set<Listener> mListeners = Collections.newSetFromMap(
new ConcurrentHashMap<Listener, Boolean>(8, 0.9f, 1));
private final List<IConferenceable> mConferenceables = new ArrayList<>();
private final List<IConferenceable> mUnmodifiableConferenceables =
private final List<Conferenceable> mConferenceables = new ArrayList<>();
private final List<Conferenceable> mUnmodifiableConferenceables =
Collections.unmodifiableList(mConferenceables);
private int mState = STATE_NEW;
@@ -1199,9 +1199,9 @@ public abstract class Connection implements IConferenceable {
*
* @param conferenceables The conferenceables.
*/
public final void setConferenceables(List<IConferenceable> conferenceables) {
public final void setConferenceables(List<Conferenceable> conferenceables) {
clearConferenceableList();
for (IConferenceable c : conferenceables) {
for (Conferenceable c : conferenceables) {
// If statement checks for duplicates in input. It makes it N^2 but we're dealing with a
// small amount of items here.
if (!mConferenceables.contains(c)) {
@@ -1221,7 +1221,7 @@ public abstract class Connection implements IConferenceable {
/**
* Returns the connections or conferences with which this connection can be conferenced.
*/
public final List<IConferenceable> getConferenceables() {
public final List<Conferenceable> getConferenceables() {
return mUnmodifiableConferenceables;
}
@@ -1486,7 +1486,7 @@ public abstract class Connection implements IConferenceable {
}
private final void clearConferenceableList() {
for (IConferenceable c : mConferenceables) {
for (Conferenceable c : mConferenceables) {
if (c instanceof Connection) {
Connection connection = (Connection) c;
connection.removeConnectionListener(mConnectionDeathListener);