| commit | c81a3008ba78c6cccc04a9fdedec9c52e4ef85c8 | [log] [tgz] |
|---|---|---|
| author | Tyler Gunn <tgunn@google.com> | Thu Oct 07 16:29:01 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Oct 07 16:29:01 2021 +0000 |
| tree | 0c87d71b55260b508daf99896695545f39540bf1 | |
| parent | 67f2fc8bbfbebabac184f852517626a6a6672390 [diff] | |
| parent | 1b703405a5cfa5974979e943e26e6f07eeb0abf2 [diff] |
Merge "IMS: Propagate RTT capability of the called party to UI." am: aa4ba6abdd am: 59765880c9 am: 02c448f741 am: 1b703405a5 Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/696031 Change-Id: I26d5fbd6a4b316fc712ada30ec19a54aa0a26dcd
diff --git a/src/com/android/services/telephony/TelephonyConnection.java b/src/com/android/services/telephony/TelephonyConnection.java old mode 100755 new mode 100644 index 53e923e..18a40cf --- a/src/com/android/services/telephony/TelephonyConnection.java +++ b/src/com/android/services/telephony/TelephonyConnection.java
@@ -2707,6 +2707,10 @@ capabilities = changeBitmask(capabilities, CAPABILITY_SUPPORTS_VT_LOCAL_BIDIRECTIONAL, isLocalVideoSupported); + capabilities = changeBitmask(capabilities, CAPABILITY_REMOTE_PARTY_SUPPORTS_RTT, + (mOriginalConnectionCapabilities & Capability.SUPPORTS_RTT_REMOTE) + == Capability.SUPPORTS_RTT_REMOTE); + return capabilities; }