From 1f8ae35c521d096d3933f5c0fcf937bbc2cb0ffd Mon Sep 17 00:00:00 2001
From: Yorke Lee <yorkelee@google.com>
Date: Wed, 15 Apr 2015 16:33:43 -0700
Subject: Don't use internal resources in InCallUI

Bug: 20090407
Change-Id: Id0e90507fe9d45545ed3774521bac68eb0bda8a7
---
 InCallUI/src/com/android/incallui/VideoCallPresenter.java | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/InCallUI/src/com/android/incallui/VideoCallPresenter.java b/InCallUI/src/com/android/incallui/VideoCallPresenter.java
index 43eef4b50..33b7d54fa 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.InCallStateListener;
 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
@@ -662,9 +658,8 @@ public class VideoCallPresenter extends Presenter<VideoCallPresenter.VideoCallUi
     }
 
     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) {
-- 
cgit v1.2.3