Add connection properties to Connections.
- Per suggestion of API council, moving properties of a Connection from CAPABILITIES_* to PROPERTIES_*. Bug: 27458894 Change-Id: Icce921b03cda514a991646ed39a26559c7e91230
This commit is contained in:
@@ -494,6 +494,16 @@ public abstract class ConnectionService extends Service {
|
||||
mAdapter.setConnectionCapabilities(id, connectionCapabilities);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onConnectionPropertiesChanged(
|
||||
Conference conference,
|
||||
int connectionProperties) {
|
||||
String id = mIdByConference.get(conference);
|
||||
Log.d(this, "call capabilities: conference: %s",
|
||||
Connection.propertiesToString(connectionProperties));
|
||||
mAdapter.setConnectionProperties(id, connectionProperties);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onVideoStateChanged(Conference c, int videoState) {
|
||||
String id = mIdByConference.get(c);
|
||||
@@ -622,6 +632,14 @@ public abstract class ConnectionService extends Service {
|
||||
mAdapter.setConnectionCapabilities(id, capabilities);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onConnectionPropertiesChanged(Connection c, int properties) {
|
||||
String id = mIdByConnection.get(c);
|
||||
Log.d(this, "properties: parcelableconnection: %s",
|
||||
Connection.propertiesToString(properties));
|
||||
mAdapter.setConnectionProperties(id, properties);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onVideoProviderChanged(Connection c, Connection.VideoProvider videoProvider) {
|
||||
String id = mIdByConnection.get(c);
|
||||
@@ -740,10 +758,11 @@ public abstract class ConnectionService extends Service {
|
||||
|
||||
Uri address = connection.getAddress();
|
||||
String number = address == null ? "null" : address.getSchemeSpecificPart();
|
||||
Log.v(this, "createConnection, number: %s, state: %s, capabilities: %s",
|
||||
Log.v(this, "createConnection, number: %s, state: %s, capabilities: %s, properties: %s",
|
||||
Connection.toLogSafePhoneNumber(number),
|
||||
Connection.stateToString(connection.getState()),
|
||||
Connection.capabilitiesToString(connection.getConnectionCapabilities()));
|
||||
Connection.capabilitiesToString(connection.getConnectionCapabilities()),
|
||||
Connection.propertiesToString(connection.getConnectionProperties()));
|
||||
|
||||
Log.d(this, "createConnection, calling handleCreateConnectionSuccessful %s", callId);
|
||||
mAdapter.handleCreateConnectionComplete(
|
||||
@@ -753,6 +772,7 @@ public abstract class ConnectionService extends Service {
|
||||
request.getAccountHandle(),
|
||||
connection.getState(),
|
||||
connection.getConnectionCapabilities(),
|
||||
connection.getConnectionProperties(),
|
||||
connection.getAddress(),
|
||||
connection.getAddressPresentation(),
|
||||
connection.getCallerDisplayName(),
|
||||
@@ -1110,6 +1130,7 @@ public abstract class ConnectionService extends Service {
|
||||
conference.getPhoneAccountHandle(),
|
||||
conference.getState(),
|
||||
conference.getConnectionCapabilities(),
|
||||
conference.getConnectionProperties(),
|
||||
connectionIds,
|
||||
conference.getVideoProvider() == null ?
|
||||
null : conference.getVideoProvider().getInterface(),
|
||||
@@ -1150,6 +1171,7 @@ public abstract class ConnectionService extends Service {
|
||||
phoneAccountHandle,
|
||||
connection.getState(),
|
||||
connection.getConnectionCapabilities(),
|
||||
connection.getConnectionProperties(),
|
||||
connection.getAddress(),
|
||||
connection.getAddressPresentation(),
|
||||
connection.getCallerDisplayName(),
|
||||
|
||||
Reference in New Issue
Block a user