commit ca1ea57bb11a28efca6155a3755617136e2fdb79
author Yorke Lee <yorkelee@google.com> Thu Apr 16 16:30:14 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 16 16:30:15 2015 +0000
tree 8d46159fc8815a1bafc8624df8af87fc8e3d493d
parent 2be016ffdd6e28cfa190971c4a0897457d2e216b
parent 1f8ae35c521d096d3933f5c0fcf937bbc2cb0ffd

Merge "Don't use internal resources in InCallUI"

InCallUI/src/com/android/incallui/VideoCallPresenter.java

diff --git a/InCallUI/src/com/android/incallui/VideoCallPresenter.java b/InCallUI/src/com/android/incallui/VideoCallPresenter.java
index 56f312f..16a6e48 100644
--- a/InCallUI/src/com/android/incallui/VideoCallPresenter.java
+++ b/InCallUI/src/com/android/incallui/VideoCallPresenter.java
@@ -35,14 +35,10 @@
 import com.android.incallui.InCallPresenter.IncomingCallListener;
 import com.android.incallui.InCallVideoCallListenerNotifier.SurfaceChangeListener;
 import com.android.incallui.InCallVideoCallListenerNotifier.VideoEventListener;
-import com.android.internal.telephony.PhoneConstants;
-import com.android.internal.telephony.TelephonyProperties;
 import com.google.common.base.Preconditions;
 
 import java.util.Objects;
 
-import android.os.SystemProperties;
-
 /**
  * Logic related to the {@link VideoCallFragment} and for managing changes to the video calling
  * surfaces based on other user interface events and incoming events from the
@@ -673,9 +669,8 @@
     }
 
     private static boolean isSpeakerEnabledForVideoCalls() {
-        return (SystemProperties.getInt(TelephonyProperties.PROPERTY_VIDEOCALL_AUDIO_OUTPUT,
-                PhoneConstants.AUDIO_OUTPUT_DEFAULT) ==
-                PhoneConstants.AUDIO_OUTPUT_ENABLE_SPEAKER);
+        // TODO: Make this a carrier configurable setting. For now this is always true. b/20090407
+        return true;
     }
 
     private void enableCamera(VideoCall videoCall, boolean isCameraRequired) {