summaryrefslogtreecommitdiff
path: root/java/com/android/dialer/simulator
diff options
context:
space:
mode:
authorwangqi <wangqi@google.com>2018-02-15 16:21:49 -0800
committerEric Erfanian <erfanian@google.com>2018-02-22 21:06:27 +0000
commit153af2febd64f989f5e67c51c0653489e3339a1a (patch)
tree08c008a84c41fabcc13c33c769643b34cbd7553d /java/com/android/dialer/simulator
parent3da989d320eff8bae7491d7ab528abd5582a3594 (diff)
Implement read/write text stream to RttCall.
This change also: 1. Add simulator support of RTT request during call (always accept at this moment, will add random accept/decline in the future) 2. Fix bugs of putting RTT call in background and back to call Bug: 67596257 Test: Simulator PiperOrigin-RevId: 185920527 Change-Id: I51016fa6cf1ccc8a5a21335f9dacf286ae393706
Diffstat (limited to 'java/com/android/dialer/simulator')
-rw-r--r--java/com/android/dialer/simulator/impl/RttChatBot.java1
-rw-r--r--java/com/android/dialer/simulator/impl/SimulatorConnection.java29
-rw-r--r--java/com/android/dialer/simulator/impl/SimulatorRttCall.java12
-rw-r--r--java/com/android/dialer/simulator/impl/SimulatorSimCallManager.java2
-rw-r--r--java/com/android/dialer/simulator/impl/SimulatorVoiceCall.java14
5 files changed, 48 insertions, 10 deletions
diff --git a/java/com/android/dialer/simulator/impl/RttChatBot.java b/java/com/android/dialer/simulator/impl/RttChatBot.java
index 5a7769f3e..b2860e387 100644
--- a/java/com/android/dialer/simulator/impl/RttChatBot.java
+++ b/java/com/android/dialer/simulator/impl/RttChatBot.java
@@ -97,7 +97,6 @@ public class RttChatBot {
break;
case SEND_MESSAGE:
String message = (String) msg.obj;
- LogUtil.w("test", "type: %s, to stream: %s", message, rttTextStream);
try {
rttTextStream.write(message);
} catch (IOException e) {
diff --git a/java/com/android/dialer/simulator/impl/SimulatorConnection.java b/java/com/android/dialer/simulator/impl/SimulatorConnection.java
index c832a5051..3aa3296ea 100644
--- a/java/com/android/dialer/simulator/impl/SimulatorConnection.java
+++ b/java/com/android/dialer/simulator/impl/SimulatorConnection.java
@@ -16,9 +16,12 @@
package com.android.dialer.simulator.impl;
+import android.annotation.TargetApi;
import android.content.Context;
import android.support.annotation.NonNull;
+import android.support.v4.os.BuildCompat;
import android.telecom.Connection;
+import android.telecom.Connection.RttTextStream;
import android.telecom.ConnectionRequest;
import android.telecom.VideoProfile;
import com.android.dialer.common.Assert;
@@ -31,11 +34,14 @@ import java.util.ArrayList;
import java.util.List;
/** Represents a single phone call on the device. */
+@TargetApi(28)
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;
+ private RttTextStream rttTextStream;
+ private RttChatBot rttChatBot;
SimulatorConnection(@NonNull Context context, @NonNull ConnectionRequest request) {
Assert.isNotNull(context);
@@ -54,6 +60,9 @@ public final class SimulatorConnection extends Connection {
getConnectionCapabilities() | CAPABILITY_SEPARATE_FROM_CONFERENCE);
}
}
+ if (BuildCompat.isAtLeastP()) {
+ rttTextStream = request.getRttTextStream();
+ }
setVideoProvider(new SimulatorVideoProvider(context, this));
simulatorConnectionsBank = SimulatorComponent.get(context).getSimulatorConnectionsBank();
}
@@ -66,6 +75,10 @@ public final class SimulatorConnection extends Connection {
listeners.remove(Assert.isNotNull(listener));
}
+ RttTextStream getRttTextStream() {
+ return rttTextStream;
+ }
+
@NonNull
public List<Event> getEvents() {
return events;
@@ -101,6 +114,11 @@ public final class SimulatorConnection extends Connection {
LogUtil.enterBlock("SimulatorConnection.onDisconnect");
simulatorConnectionsBank.remove(this);
onEvent(new Event(Event.DISCONNECT));
+ rttTextStream = null;
+ if (rttChatBot != null) {
+ rttChatBot.stop();
+ rttChatBot = null;
+ }
}
@Override
@@ -124,12 +142,21 @@ public final class SimulatorConnection extends Connection {
@Override
public void onStartRtt(@NonNull RttTextStream rttTextStream) {
LogUtil.enterBlock("SimulatorConnection.onStartRtt");
+ if (this.rttTextStream != null || rttChatBot != null) {
+ LogUtil.e("SimulatorConnection.onStartRtt", "rttTextStream or rttChatBot is not null!");
+ }
+ this.rttTextStream = rttTextStream;
+ rttChatBot = new RttChatBot(rttTextStream);
+ rttChatBot.start();
onEvent(new Event(Event.START_RTT));
}
@Override
public void onStopRtt() {
LogUtil.enterBlock("SimulatorConnection.onStopRtt");
+ rttChatBot.stop();
+ rttChatBot = null;
+ rttTextStream = null;
onEvent(new Event(Event.STOP_RTT));
}
@@ -159,6 +186,4 @@ public final class SimulatorConnection extends Connection {
public interface Listener {
void onEvent(@NonNull SimulatorConnection connection, @NonNull Event event);
}
-
-
}
diff --git a/java/com/android/dialer/simulator/impl/SimulatorRttCall.java b/java/com/android/dialer/simulator/impl/SimulatorRttCall.java
index 7b0066719..352b9e4ef 100644
--- a/java/com/android/dialer/simulator/impl/SimulatorRttCall.java
+++ b/java/com/android/dialer/simulator/impl/SimulatorRttCall.java
@@ -34,6 +34,7 @@ final class SimulatorRttCall
@NonNull private final Context context;
@Nullable private String connectionTag;
+ private RttChatBot rttChatBot;
static ActionProvider getActionProvider(@NonNull Context context) {
return new SimulatorSubMenu(context)
@@ -112,24 +113,29 @@ final class SimulatorRttCall
switch (event.type) {
case Event.NONE:
throw Assert.createIllegalStateFailException();
- case Event.ANSWER:
- connection.setActive();
- break;
case Event.REJECT:
connection.setDisconnected(new DisconnectCause(DisconnectCause.REJECTED));
break;
case Event.HOLD:
connection.setOnHold();
break;
+ case Event.ANSWER:
case Event.UNHOLD:
connection.setActive();
break;
case Event.DISCONNECT:
+ rttChatBot.stop();
connection.setDisconnected(new DisconnectCause(DisconnectCause.LOCAL));
break;
case Event.SESSION_MODIFY_REQUEST:
ThreadUtil.postDelayedOnUiThread(() -> connection.handleSessionModifyRequest(event), 2000);
break;
+ case Event.STATE_CHANGE:
+ if (Connection.stateToString(Connection.STATE_ACTIVE).equals(event.data2)) {
+ rttChatBot = new RttChatBot(connection.getRttTextStream());
+ rttChatBot.start();
+ }
+ break;
default:
LogUtil.i("SimulatorRttCall.onEvent", "unexpected event: " + event.type);
break;
diff --git a/java/com/android/dialer/simulator/impl/SimulatorSimCallManager.java b/java/com/android/dialer/simulator/impl/SimulatorSimCallManager.java
index d51e06816..c56afb21f 100644
--- a/java/com/android/dialer/simulator/impl/SimulatorSimCallManager.java
+++ b/java/com/android/dialer/simulator/impl/SimulatorSimCallManager.java
@@ -115,7 +115,7 @@ public class SimulatorSimCallManager {
TelecomManager.EXTRA_PHONE_ACCOUNT_HANDLE,
callType == CALL_TYPE_VIDEO
? getVideoProviderHandle(context)
- : getSystemPhoneAccountHandle(context));
+ : getSimCallManagerHandle(context));
if (callType == CALL_TYPE_RTT) {
outgoingCallExtras.putBoolean(TelecomManager.EXTRA_START_CALL_WITH_RTT, true);
}
diff --git a/java/com/android/dialer/simulator/impl/SimulatorVoiceCall.java b/java/com/android/dialer/simulator/impl/SimulatorVoiceCall.java
index d4c7ee458..e59cddd51 100644
--- a/java/com/android/dialer/simulator/impl/SimulatorVoiceCall.java
+++ b/java/com/android/dialer/simulator/impl/SimulatorVoiceCall.java
@@ -22,6 +22,7 @@ import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v7.app.AppCompatActivity;
import android.telecom.Connection;
+import android.telecom.Connection.RttModifyStatus;
import android.telecom.DisconnectCause;
import android.view.ActionProvider;
import com.android.dialer.common.Assert;
@@ -223,15 +224,13 @@ final class SimulatorVoiceCall
switch (event.type) {
case Event.NONE:
throw Assert.createIllegalStateFailException();
- case Event.ANSWER:
- connection.setActive();
- break;
case Event.REJECT:
connection.setDisconnected(new DisconnectCause(DisconnectCause.REJECTED));
break;
case Event.HOLD:
connection.setOnHold();
break;
+ case Event.ANSWER:
case Event.UNHOLD:
connection.setActive();
break;
@@ -244,6 +243,15 @@ final class SimulatorVoiceCall
case Event.SESSION_MODIFY_REQUEST:
ThreadUtil.postDelayedOnUiThread(() -> connection.handleSessionModifyRequest(event), 2000);
break;
+ case Event.START_RTT:
+ // TODO(wangqi): Add random accept/decline.
+ boolean accept = true;
+ if (accept) {
+ connection.sendRttInitiationSuccess();
+ } else {
+ connection.sendRttInitiationFailure(RttModifyStatus.SESSION_MODIFY_REQUEST_FAIL);
+ }
+ break;
default:
LogUtil.i("SimulatorVoiceCall.onEvent", "unexpected event: " + event.type);
break;