Schematize Telephony System Properties am: c811357b7b am: a4a0ef63a0
Change-Id: Ic26e822281aa2d33a21efbab7b4563f63b3756eb
diff --git a/src/com/android/server/telecom/CallsManager.java b/src/com/android/server/telecom/CallsManager.java
index d937abd..dbdc03b 100644
--- a/src/com/android/server/telecom/CallsManager.java
+++ b/src/com/android/server/telecom/CallsManager.java
@@ -53,7 +53,6 @@
import android.os.PersistableBundle;
import android.os.Process;
import android.os.SystemClock;
-import android.os.SystemProperties;
import android.os.SystemVibrator;
import android.os.Trace;
import android.os.UserHandle;
@@ -62,6 +61,7 @@
import android.provider.BlockedNumberContract.SystemContract;
import android.provider.CallLog.Calls;
import android.provider.Settings;
+import android.sysprop.TelephonyProperties;
import android.telecom.CallAudioState;
import android.telecom.Conference;
import android.telecom.Connection;
@@ -86,7 +86,6 @@
import com.android.internal.annotations.VisibleForTesting;
import android.telecom.CallerInfo;
import com.android.internal.telephony.PhoneConstants;
-import com.android.internal.telephony.TelephonyProperties;
import com.android.internal.util.IndentingPrintWriter;
import com.android.server.telecom.bluetooth.BluetoothRouteManager;
import com.android.server.telecom.bluetooth.BluetoothStateReceiver;
@@ -2261,9 +2260,8 @@
* @return {@code true} if the speakerphone should automatically be enabled.
*/
private static boolean isSpeakerEnabledForVideoCalls() {
- return (SystemProperties.getInt(TelephonyProperties.PROPERTY_VIDEOCALL_AUDIO_OUTPUT,
- PhoneConstants.AUDIO_OUTPUT_DEFAULT) ==
- PhoneConstants.AUDIO_OUTPUT_ENABLE_SPEAKER);
+ return TelephonyProperties.videocall_audio_output().orElse(
+ PhoneConstants.AUDIO_OUTPUT_DEFAULT) == PhoneConstants.AUDIO_OUTPUT_ENABLE_SPEAKER;
}
/**