commit 5070ebc9cf209c9b751cb352d6cc582713b70d71
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jan 17 23:34:49 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jan 17 23:34:49 2020 +0000
tree 002ea3621de391d5d028c43e752d83921c58cd5a
parent 7c0216092acf75bd769ba93de66f6ee4d1a76a26
parent ce94e0b7da1fdfdb725efb7309e0af11f283392f

Merge changes from topic "phone-constants-telecom" am: d982f6c3bb am: f4fafdbd69 am: ce94e0b7da

Change-Id: Id00cd3fe7b7f63115de1332892fc5837ee990ca0

telecomm/java/android/telecom/TelecomManager.java

diff --git a/telecomm/java/android/telecom/TelecomManager.java b/telecomm/java/android/telecom/TelecomManager.java
index c4c1e21..c3fb510 100644
--- a/telecomm/java/android/telecom/TelecomManager.java
+++ b/telecomm/java/android/telecom/TelecomManager.java
@@ -849,6 +849,17 @@
      */
     public static final int PRESENTATION_PAYPHONE = 4;
 
+
+    /*
+     * Values for the adb property "persist.radio.videocall.audio.output"
+     */
+    /** @hide */
+    public static final int AUDIO_OUTPUT_ENABLE_SPEAKER = 0;
+    /** @hide */
+    public static final int AUDIO_OUTPUT_DISABLE_SPEAKER = 1;
+    /** @hide */
+    public static final int AUDIO_OUTPUT_DEFAULT = AUDIO_OUTPUT_ENABLE_SPEAKER;
+
     /** @hide */
     @Retention(RetentionPolicy.SOURCE)
     @IntDef(