diff options
author | weijiaxu <weijiaxu@google.com> | 2017-11-17 10:33:02 -0800 |
---|---|---|
committer | zachh <zachh@google.com> | 2017-11-18 07:34:31 +0000 |
commit | 450c96108c73569dbe13a9e91dc35b34e940aecc (patch) | |
tree | b9c05c7946b0baa547824793b2c6178bc9795acd /java/com/android/dialer/simulator/impl/SimulatorConnection.java | |
parent | 038b4eedce750f09d0b12fd379137e4e618ca184 (diff) |
Fix dialer simulator for conference calling funcitonality.
Updated the following contents:
1.Fix the order of spawning connections for GSM conference.
2.Make VOLTE conference call more realistic.
3.Fix minor bugs about simulator.
4.Add SimulatorConnectionsBank class to store connection tags created by simulator.
5.Fix tests influenced by SimulatorConnectionsBank.
WANT_LGTM=wangqi
Bug: 67785540
Test: In dialer lab.
PiperOrigin-RevId: 176127584
Change-Id: I846174b97ed9329df6347583c41095f45f43494b
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, 6 insertions, 0 deletions
diff --git a/java/com/android/dialer/simulator/impl/SimulatorConnection.java b/java/com/android/dialer/simulator/impl/SimulatorConnection.java index 168f5db98..2a24d8f37 100644 --- a/java/com/android/dialer/simulator/impl/SimulatorConnection.java +++ b/java/com/android/dialer/simulator/impl/SimulatorConnection.java @@ -24,6 +24,8 @@ import android.telecom.VideoProfile; import com.android.dialer.common.Assert; import com.android.dialer.common.LogUtil; import com.android.dialer.simulator.Simulator.Event; +import com.android.dialer.simulator.SimulatorComponent; +import com.android.dialer.simulator.SimulatorConnectionsBank; import java.util.ArrayList; import java.util.List; @@ -31,6 +33,7 @@ import java.util.List; public final class SimulatorConnection extends Connection { private final List<Listener> listeners = new ArrayList<>(); private final List<Event> events = new ArrayList<>(); + private final SimulatorConnectionsBank simulatorConnectionsBank; private int currentState = STATE_NEW; SimulatorConnection(@NonNull Context context, @NonNull ConnectionRequest request) { @@ -47,6 +50,7 @@ public final class SimulatorConnection extends Connection { setConnectionCapabilities(getConnectionCapabilities() | CAPABILITY_SEPARATE_FROM_CONFERENCE); } setVideoProvider(new SimulatorVideoProvider(context, this)); + simulatorConnectionsBank = SimulatorComponent.get(context).getSimulatorConnectionsBank(); } public void addListener(@NonNull Listener listener) { @@ -71,6 +75,7 @@ public final class SimulatorConnection extends Connection { @Override public void onReject() { LogUtil.enterBlock("SimulatorConnection.onReject"); + simulatorConnectionsBank.remove(this); onEvent(new Event(Event.REJECT)); } @@ -89,6 +94,7 @@ public final class SimulatorConnection extends Connection { @Override public void onDisconnect() { LogUtil.enterBlock("SimulatorConnection.onDisconnect"); + simulatorConnectionsBank.remove(this); onEvent(new Event(Event.DISCONNECT)); } |