aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad Ebinger <breadley@google.com>2017-09-07 18:32:01 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-09-07 18:32:01 +0000
commit377cda6bd217b443c220b178a2f748a7bae0a59b (patch)
treed8a3459484bedd6ba8ab792ebc3ce0d41323e75e
parentdd41e5846dbfb6c5d14673819ce08702c4e98eea (diff)
parent3ae635e249413741302da5d209e32a034ba355a8 (diff)
downloadtelephony-377cda6bd217b443c220b178a2f748a7bae0a59b.tar.gz
Merge "Fixed TTY Mode RIL update bug" into oc-mr1-dev
-rw-r--r--src/java/com/android/internal/telephony/GsmCdmaPhone.java2
-rw-r--r--src/java/com/android/internal/telephony/imsphone/ImsPhone.java1
2 files changed, 2 insertions, 1 deletions
diff --git a/src/java/com/android/internal/telephony/GsmCdmaPhone.java b/src/java/com/android/internal/telephony/GsmCdmaPhone.java
index 35a2d41ebb..d95d0183b5 100644
--- a/src/java/com/android/internal/telephony/GsmCdmaPhone.java
+++ b/src/java/com/android/internal/telephony/GsmCdmaPhone.java
@@ -1855,6 +1855,8 @@ public class GsmCdmaPhone extends Phone {
@Override
public void setTTYMode(int ttyMode, Message onComplete) {
+ // Send out the TTY Mode change over RIL as well
+ super.setTTYMode(ttyMode, onComplete);
if (mImsPhone != null) {
mImsPhone.setTTYMode(ttyMode, onComplete);
}
diff --git a/src/java/com/android/internal/telephony/imsphone/ImsPhone.java b/src/java/com/android/internal/telephony/imsphone/ImsPhone.java
index 3c13a408ae..45dc0b2798 100644
--- a/src/java/com/android/internal/telephony/imsphone/ImsPhone.java
+++ b/src/java/com/android/internal/telephony/imsphone/ImsPhone.java
@@ -713,7 +713,6 @@ public class ImsPhone extends ImsPhoneBase {
@Override
public void setTTYMode(int ttyMode, Message onComplete) {
- super.setTTYMode(ttyMode, onComplete);
mCT.setTtyMode(ttyMode);
}