diff options
author | yueg <yueg@google.com> | 2017-10-16 14:23:26 -0700 |
---|---|---|
committer | Eric Erfanian <erfanian@google.com> | 2017-10-17 08:07:25 -0700 |
commit | 2f8d48f5e981ab9945c907cd9ab0f6bd6a82db22 (patch) | |
tree | ad5e5bed1fe75941840374419f0bc06dc88641c3 /java/com/android/dialer/simulator/impl/SimulatorConnection.java | |
parent | 5a6cb962ae30ad9e308b5bcc00920daf84618808 (diff) |
Add GSM conference calling to simulator.
This CL adds a new item to the simulator menu:
- Add GSM conference
The GSM conference action creates a conference with 5 phone calls.
Users can individually separate or kick calls out of the conference. Hanging up the second last call finishes the conference.
Bug: 67785540
Test: SimulatorConferenceTest
PiperOrigin-RevId: 172377631
Change-Id: Ic30fa6c65cf782247f75bcdd1ecbd86b1c16f143
Diffstat (limited to 'java/com/android/dialer/simulator/impl/SimulatorConnection.java')
-rw-r--r-- | java/com/android/dialer/simulator/impl/SimulatorConnection.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/java/com/android/dialer/simulator/impl/SimulatorConnection.java b/java/com/android/dialer/simulator/impl/SimulatorConnection.java index 70c1095dc..e4a34b51b 100644 --- a/java/com/android/dialer/simulator/impl/SimulatorConnection.java +++ b/java/com/android/dialer/simulator/impl/SimulatorConnection.java @@ -41,7 +41,9 @@ public final class SimulatorConnection extends Connection { CAPABILITY_MUTE | CAPABILITY_SUPPORT_HOLD | CAPABILITY_HOLD - | CAPABILITY_CAN_UPGRADE_TO_VIDEO); + | CAPABILITY_CAN_UPGRADE_TO_VIDEO + | CAPABILITY_DISCONNECT_FROM_CONFERENCE + | CAPABILITY_SEPARATE_FROM_CONFERENCE); setVideoProvider(new SimulatorVideoProvider(context, this)); } @@ -108,7 +110,7 @@ public final class SimulatorConnection extends Connection { void onEvent(@NonNull Event event) { events.add(Assert.isNotNull(event)); - for (Listener listener : listeners) { + for (Listener listener : new ArrayList<>(listeners)) { listener.onEvent(this, event); } } |