diff options
| author | Scott Lobdell <slobdell@google.com> | 2019-01-31 11:53:41 -0800 |
|---|---|---|
| committer | Scott Lobdell <slobdell@google.com> | 2019-02-01 14:08:42 -0800 |
| commit | 88b45c586d461df38b866d529bc98d1dfa3e8838 (patch) | |
| tree | ae57a86275dac94c0899015923778f3016c865b2 /telecomm/java/android/telecom/Connection.java | |
| parent | 067596650927fa91a97355e84b152b21826f7ae2 (diff) | |
| parent | 9b9ca46fc2d3da231bf9ef6ff630105720f94cf2 (diff) | |
Merge QP1A.190122.001
Conflicts:
api/system-current.txt
core/java/android/bluetooth/BluetoothAdapter.java
core/jni/android_util_Process.cpp
core/jni/com_android_internal_os_Zygote.cpp
core/res/res/values/config.xml
core/res/res/values/symbols.xml
media/java/android/media/MediaCodecInfo.java
packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java
services/core/java/com/android/server/ConnectivityService.java
services/core/java/com/android/server/LocationManagerService.java
services/core/java/com/android/server/am/ActivityManagerService.java
services/core/java/com/android/server/connectivity/NetworkAgentInfo.java
services/core/java/com/android/server/location/GnssLocationProvider.java
services/core/java/com/android/server/wm/ActivityStack.java
services/net/java/android/net/ip/IpClient.java
telecomm/java/android/telecom/Connection.java
telephony/java/android/telephony/ims/ImsCallSession.java
telephony/java/android/telephony/ims/ImsCallSessionListener.java
telephony/java/android/telephony/ims/aidl/IImsCallSessionListener.aidl
telephony/java/android/telephony/ims/compat/stub/ImsCallSessionImplBase.java
telephony/java/com/android/ims/internal/IImsCallSessionListener.aidl
wifi/java/android/net/wifi/WifiConfiguration.java
Change-Id: I367301986f2ae80a528050c3d78776b5a4c6b5ee
Diffstat (limited to 'telecomm/java/android/telecom/Connection.java')
| -rw-r--r-- | telecomm/java/android/telecom/Connection.java | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/telecomm/java/android/telecom/Connection.java b/telecomm/java/android/telecom/Connection.java index 165349216d44..8b7299fa890f 100644 --- a/telecomm/java/android/telecom/Connection.java +++ b/telecomm/java/android/telecom/Connection.java @@ -525,6 +525,13 @@ public abstract class Connection extends Conferenceable { */ public static final String EXTRA_CALL_PROPERTY = "android.telecom.extra.EXTRA_CALL_PROPERTY"; + /** + * Boolean connection extra key set on the extras passed to + * {@link Connection#sendConnectionEvent} which indicates that audio is present + * on the RTT call when the extra value is true. + */ + public static final String EXTRA_IS_RTT_AUDIO_PRESENT = + "android.telecom.extra.IS_RTT_AUDIO_PRESENT"; /** * Connection event used to inform Telecom that it should play the on hold tone. This is used @@ -648,6 +655,12 @@ public abstract class Connection extends Conferenceable { */ public static final String EVENT_CALL_PROPERTY_CHANGED = "android.telecom.event.EVENT_CALL_PROPERTY_CHANGED"; + /** + * Connection event used to inform an {@link InCallService} that the RTT audio indication + * has changed. + */ + public static final String EVENT_RTT_AUDIO_INDICATION_CHANGED = + "android.telecom.event.RTT_AUDIO_INDICATION_CHANGED"; // Flag controlling whether PII is emitted into the logs private static final boolean PII_DEBUG = Log.isLoggable(android.util.Log.DEBUG); |