Stop using hidden TelephonyProperties and PhoneConstants
Move the video-call related constants to TelecomManager since Telecom is
the only consumer. Also query from sysprop.TelephonyProperties instead
of the hidden one in telephony.
Bug: 147845600
Bug: 146834818
Test: manually make a video call and verify audio route
Change-Id: I2bdf19d14e9d9359b5dd0b09481f3397986d7f1c
diff --git a/src/com/android/server/telecom/CallsManager.java b/src/com/android/server/telecom/CallsManager.java
index dbdc03b..82422db 100644
--- a/src/com/android/server/telecom/CallsManager.java
+++ b/src/com/android/server/telecom/CallsManager.java
@@ -85,7 +85,6 @@
import com.android.internal.annotations.VisibleForTesting;
import android.telecom.CallerInfo;
-import com.android.internal.telephony.PhoneConstants;
import com.android.internal.util.IndentingPrintWriter;
import com.android.server.telecom.bluetooth.BluetoothRouteManager;
import com.android.server.telecom.bluetooth.BluetoothStateReceiver;
@@ -2260,8 +2259,9 @@
* @return {@code true} if the speakerphone should automatically be enabled.
*/
private static boolean isSpeakerEnabledForVideoCalls() {
- return TelephonyProperties.videocall_audio_output().orElse(
- PhoneConstants.AUDIO_OUTPUT_DEFAULT) == PhoneConstants.AUDIO_OUTPUT_ENABLE_SPEAKER;
+ return TelephonyProperties.videocall_audio_output()
+ .orElse(TelecomManager.AUDIO_OUTPUT_DEFAULT)
+ == TelecomManager.AUDIO_OUTPUT_ENABLE_SPEAKER;
}
/**