summaryrefslogtreecommitdiffstats
path: root/api/system-current.txt
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2015-05-13 18:55:18 -0700
committerYorke Lee <yorkelee@google.com>2015-05-13 20:48:19 -0700
commitabfcfdc0444c48dd161e425c8417dab87de1cb69 (patch)
tree0afc3f8161e22e3790b581d582d652bc91b53ffc /api/system-current.txt
parentc9be9f4d5bcf513654dbca24e648312d61e04bfc (diff)
downloadframeworks_base-abfcfdc0444c48dd161e425c8417dab87de1cb69.zip
frameworks_base-abfcfdc0444c48dd161e425c8417dab87de1cb69.tar.gz
frameworks_base-abfcfdc0444c48dd161e425c8417dab87de1cb69.tar.bz2
Make Conferenceable an abstract class
Bug: 21066017 Change-Id: Ibcbccfc7b1380e417b464aed9b968cbc0a6a1cc2
Diffstat (limited to 'api/system-current.txt')
-rw-r--r--api/system-current.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/api/system-current.txt b/api/system-current.txt
index d727b22..95d8ae6 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -32203,7 +32203,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();
@@ -32247,10 +32247,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();