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

DO NOT MERGE Remove deprecated telecom APIs. Mark others final.

Browse Source 
Bug:
Change-Id: I8a04903052a964f3997b5bb36730b8b200c8e472
This commit is contained in:
Jay Shrauner
2015-04-14 18:16:10 -07:00
parent d05bd467ba
commit 193de667ed
8 changed files with 10 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,7 +38,7 @@ public abstract class Conference implements IConferenceable {
* Used to indicate that the conference connection time is not specified. If not specified,
* Telecom will set the connect time.
*/
public static long CONNECT_TIME_NOT_SPECIFIED = 0;
public static final long CONNECT_TIME_NOT_SPECIFIED = 0;
/** @hide */
public abstract static class Listener {
@@ -63,7 +63,7 @@ public abstract class Conference implements IConferenceable {
private final List<Connection> mUnmodifiableConferenceableConnections =
Collections.unmodifiableList(mConferenceableConnections);
protected PhoneAccountHandle mPhoneAccount;
private PhoneAccountHandle mPhoneAccount;
private AudioState mAudioState;
private int mState = Connection.STATE_NEW;
private DisconnectCause mDisconnectCause;
@@ -116,11 +116,6 @@ public abstract class Conference implements IConferenceable {
return mState;
}
/** @hide */
@Deprecated public final int getCapabilities() {
return getConnectionCapabilities();
}
/**
* Returns the capabilities of a conference. See {@code CAPABILITY_*} constants in class
* {@link Connection} for valid values.
@@ -301,11 +296,6 @@ public abstract class Conference implements IConferenceable {
return mDisconnectCause;
}
/** @hide */
@Deprecated public final void setCapabilities(int connectionCapabilities) {
setConnectionCapabilities(connectionCapabilities);
}
/**
* Sets the capabilities of a conference. See {@code CAPABILITY_*} constants of class
* {@link Connection} for valid values.