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

am 0125d76f: Merge "Make Conferenceable an abstract class" into mnc-dev

Browse Source 
* commit '0125d76fa37d26a29f06371ff349546e21cd3f4d':
  Make Conferenceable an abstract class
This commit is contained in:
Yorke Lee
2015-05-14 17:44:57 +00:00
committed by Android Git Automerger
parent c2bdee591f 0125d76fa3
commit eb4978224d
6 changed files with 10 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
api/current.txt
View File

@@ -30051,7 +30051,7 @@ package android.telecom {
field public static final int ROUTE_WIRED_OR_EARPIECE = 5; // 0x5
}
public abstract class Conference implements android.telecom.Conferenceable {
public abstract class Conference extends android.telecom.Conferenceable {
ctor public Conference(android.telecom.PhoneAccountHandle);
method public final boolean addConnection(android.telecom.Connection);
method public final void destroy();
@@ -30090,10 +30090,10 @@ package android.telecom {
field public static final long CONNECT_TIME_NOT_SPECIFIED = 0L; // 0x0L
}
public abstract interface Conferenceable {
public abstract class Conferenceable {
}
public abstract class Connection implements android.telecom.Conferenceable {
public abstract class Connection extends android.telecom.Conferenceable {
ctor public Connection();
method public static java.lang.String capabilitiesToString(int);
method public static android.telecom.Connection createCanceledConnection();

6
api/system-current.txt
View File

@@ -32204,7 +32204,7 @@ package android.telecom {
field public static final int ROUTE_WIRED_OR_EARPIECE = 5; // 0x5
}
public abstract class Conference implements android.telecom.Conferenceable {
public abstract class Conference extends android.telecom.Conferenceable {
ctor public Conference(android.telecom.PhoneAccountHandle);
method public final boolean addConnection(android.telecom.Connection);
method public final void destroy();
@@ -32248,10 +32248,10 @@ package android.telecom {
field public static final long CONNECT_TIME_NOT_SPECIFIED = 0L; // 0x0L
}
public abstract interface Conferenceable {
public abstract class Conferenceable {
}
public abstract class Connection implements android.telecom.Conferenceable {
public abstract class Connection extends android.telecom.Conferenceable {
ctor public Connection();
method public static java.lang.String capabilitiesToString(int);
method public static android.telecom.Connection createCanceledConnection();

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

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

4
telecomm/java/android/telecom/Conferenceable.java
View File

@@ -21,6 +21,6 @@ package android.telecom;
* call with. The {@link ConnectionService} implementation will only recognize
* {@link Conferenceable}s which are {@link Connection}s or {@link Conference}s.
*/
public interface Conferenceable {
public abstract class Conferenceable {
Conferenceable() {}
}

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

@@ -47,7 +47,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 Conferenceable {
public abstract class Connection extends Conferenceable {
public static final int STATE_INITIALIZING = 0;

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

@@ -1,28 +0,0 @@
/*
* Copyright (C) 2014 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.
* <p>
* @deprecated use {@link Conferenceable} instead.
* @hide
*/
public interface IConferenceable extends Conferenceable {
}