commit 3e344313a753616ea800f2c0810512053c45e61b
author Pranav Madapurmath <pmadapurmath@google.com> Wed Jan 17 19:33:58 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jan 17 19:33:58 2024 +0000
tree f3a3fae9a48e1722c37ee283d417daef8337bd0f
parent bc4221eef913cbb181e5594d0e0f44c4d0a7c68e
parent 71a30ff8a4f6375fd5e7f227349f31842c28bb00

Merge "Resolve telephony property dependency in telecom" into main

src/com/android/server/telecom/CallsManager.java

diff --git a/src/com/android/server/telecom/CallsManager.java b/src/com/android/server/telecom/CallsManager.java
index afba3aa..1af4757 100755
--- a/src/com/android/server/telecom/CallsManager.java
+++ b/src/com/android/server/telecom/CallsManager.java
@@ -73,6 +73,7 @@
 import android.os.Process;
 import android.os.ResultReceiver;
 import android.os.SystemClock;
+import android.os.SystemProperties;
 import android.os.SystemVibrator;
 import android.os.Trace;
 import android.os.UserHandle;
@@ -3131,9 +3132,8 @@
      * @return {@code true} if the speakerphone should automatically be enabled.
      */
     private static boolean isSpeakerEnabledForVideoCalls() {
-        return TelephonyProperties.videocall_audio_output()
-                .orElse(TelecomManager.AUDIO_OUTPUT_DEFAULT)
-                == TelecomManager.AUDIO_OUTPUT_ENABLE_SPEAKER;
+        return SystemProperties.getInt(TelecomManager.PROPERTY_VIDEOCALL_AUDIO_OUTPUT,
+                TelecomManager.AUDIO_OUTPUT_DEFAULT) == TelecomManager.AUDIO_OUTPUT_ENABLE_SPEAKER;
     }
 
     /**