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

Merge "Make connection events work for conferences"

Browse Source 
am: fc53864672

Change-Id: I2248723dfc7ce7c1488b58c6907b23bf3c713ee7
This commit is contained in:
Hall Liu
2019-04-16 19:10:04 -07:00
committed by android-build-merger
parent d4c5fdf4f9 fc53864672
commit 7ae228c189
2 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -68,6 +68,7 @@ public abstract class Conference extends Conferenceable {
public void onExtrasRemoved(Conference c, List<String> keys) {} public void onExtrasRemoved(Conference c, List<String> keys) {}
public void onConferenceStateChanged(Conference c, boolean isConference) {} public void onConferenceStateChanged(Conference c, boolean isConference) {}
public void onAddressChanged(Conference c, Uri newAddress, int presentation) {} public void onAddressChanged(Conference c, Uri newAddress, int presentation) {}
public void onConnectionEvent(Conference c, String event, Bundle extras) {}
public void onCallerDisplayNameChanged( public void onCallerDisplayNameChanged(
Conference c, String callerDisplayName, int presentation) {} Conference c, String callerDisplayName, int presentation) {}
} }
@@ -1024,4 +1025,14 @@ public abstract class Conference extends Conferenceable {
} }
onExtrasChanged(b); onExtrasChanged(b);
} }
/**
* See {@link Connection#sendConnectionEvent(String, Bundle)}
* @hide
*/
public void sendConnectionEvent(String event, Bundle extras) {
for (Listener l : mListeners) {
l.onConnectionEvent(this, event, extras);
}
}
} }

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

@@ -1279,6 +1279,14 @@ public abstract class ConnectionService extends Service {
mAdapter.setCallerDisplayName(id, callerDisplayName, presentation); mAdapter.setCallerDisplayName(id, callerDisplayName, presentation);
} }
} }
@Override
public void onConnectionEvent(Conference c, String event, Bundle extras) {
String id = mIdByConference.get(c);
if (id != null) {
mAdapter.onConnectionEvent(id, event, extras);
}
}
}; };
private final Connection.Listener mConnectionListener = new Connection.Listener() { private final Connection.Listener mConnectionListener = new Connection.Listener() {