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

14
api/current.txt
View File

@@ -30104,7 +30104,7 @@ package android.telecom {
field public static final android.os.Parcelable.Creator<android.telecom.CameraCapabilities> CREATOR;
}
public abstract class Conference implements android.telecom.IConferenceable {
public abstract class Conference implements android.telecom.Conferenceable {
ctor public Conference(android.telecom.PhoneAccountHandle);
method public final boolean addConnection(android.telecom.Connection);
method public final void destroy();
@@ -30138,7 +30138,10 @@ package android.telecom {
field public static final long CONNECT_TIME_NOT_SPECIFIED = 0L; // 0x0L
}
public abstract class Connection implements android.telecom.IConferenceable {
public abstract interface Conferenceable {
}
public abstract class Connection implements android.telecom.Conferenceable {
ctor public Connection();
method public static java.lang.String capabilitiesToString(int);
method public static android.telecom.Connection createCanceledConnection();
@@ -30151,7 +30154,7 @@ package android.telecom {
method public final java.lang.String getCallerDisplayName();
method public final int getCallerDisplayNamePresentation();
method public final android.telecom.Conference getConference();
method public final java.util.List<android.telecom.IConferenceable> getConferenceables();
method public final java.util.List<android.telecom.Conferenceable> getConferenceables();
method public final int getConnectionCapabilities();
method public final android.telecom.DisconnectCause getDisconnectCause();
method public final int getState();
@@ -30175,7 +30178,7 @@ package android.telecom {
method public final void setAudioModeIsVoip(boolean);
method public final void setCallerDisplayName(java.lang.String, int);
method public final void setConferenceableConnections(java.util.List<android.telecom.Connection>);
method public final void setConferenceables(java.util.List<android.telecom.IConferenceable>);
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();
@@ -30303,9 +30306,6 @@ package android.telecom {
field public static final android.os.Parcelable.Creator<android.telecom.GatewayInfo> CREATOR;
}
public abstract interface IConferenceable {
}
public abstract class InCallService extends android.app.Service {
ctor public InCallService();
method public final boolean canAddCall();

14
api/system-current.txt
View File

@@ -32213,7 +32213,7 @@ package android.telecom {
field public static final android.os.Parcelable.Creator<android.telecom.CameraCapabilities> CREATOR;
}
public abstract class Conference implements android.telecom.IConferenceable {
public abstract class Conference implements android.telecom.Conferenceable {
ctor public Conference(android.telecom.PhoneAccountHandle);
method public final boolean addConnection(android.telecom.Connection);
method public final void destroy();
@@ -32247,7 +32247,10 @@ package android.telecom {
field public static final long CONNECT_TIME_NOT_SPECIFIED = 0L; // 0x0L
}
public abstract class Connection implements android.telecom.IConferenceable {
public abstract interface Conferenceable {
}
public abstract class Connection implements android.telecom.Conferenceable {
ctor public Connection();
method public static java.lang.String capabilitiesToString(int);
method public static android.telecom.Connection createCanceledConnection();
@@ -32260,7 +32263,7 @@ package android.telecom {
method public final java.lang.String getCallerDisplayName();
method public final int getCallerDisplayNamePresentation();
method public final android.telecom.Conference getConference();
method public final java.util.List<android.telecom.IConferenceable> getConferenceables();
method public final java.util.List<android.telecom.Conferenceable> getConferenceables();
method public final int getConnectionCapabilities();
method public final android.telecom.DisconnectCause getDisconnectCause();
method public final int getState();
@@ -32284,7 +32287,7 @@ package android.telecom {
method public final void setAudioModeIsVoip(boolean);
method public final void setCallerDisplayName(java.lang.String, int);
method public final void setConferenceableConnections(java.util.List<android.telecom.Connection>);
method public final void setConferenceables(java.util.List<android.telecom.IConferenceable>);
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();
@@ -32412,9 +32415,6 @@ package android.telecom {
field public static final android.os.Parcelable.Creator<android.telecom.GatewayInfo> CREATOR;
}
public abstract interface IConferenceable {
}
public abstract class InCallService extends android.app.Service {
ctor public InCallService();
method public final boolean canAddCall();

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

@@ -29,7 +29,7 @@ import java.util.concurrent.CopyOnWriteArraySet;
/**
* Represents a conference call which can contain any number of {@link Connection} objects.
*/
public abstract class Conference implements IConferenceable {
public abstract class Conference implements Conferenceable {
/**
* Used to indicate that the conference connection time is not specified. If not specified,

26
telecomm/java/android/telecom/Conferenceable.java Normal file
View File

@@ -0,0 +1,26 @@
/*
* Copyright (C) 2015 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License
*/
package android.telecom;
/**
* Interface used to identify entities with which another entity can participate in a conference
* call with. The {@link ConnectionService} implementation will only recognize
* {@link Conferenceable}s which are {@link Connection}s or {@link Conference}s.
*/
public interface Conferenceable {
}

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

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;

8
telecomm/java/android/telecom/IConferenceable.java
View File

@@ -19,8 +19,10 @@ package android.telecom;
/**
* Interface used to identify entities with which another entity can participate in a conference
* call with. The {@link ConnectionService} implementation will only recognize
* {@link IConferenceable}s which are {@link Connection}s or {@link Conference}s.
* {@link Conferenceable}s which are {@link Connection}s or {@link Conference}s.
* <p>
* @deprecated use {@link Conferenceable} instead.
* @hide
*/
public interface IConferenceable {
public interface IConferenceable extends Conferenceable {
}