summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2015-04-15 16:33:43 -0700
committerYorke Lee <yorkelee@google.com>2015-04-15 16:49:01 -0700
commit0db9323cb952bc7e9369292b7f28634138f4cfc3 (patch)
tree8e3f984fc7bb9dbdfc50f331ad244f6167ff1870
parent734e03af7c8258fdd4c83e1204588a831733e09a (diff)
DO NOT MERGE Don't use internal resources in InCallUI
Bug: 20090407 Change-Id: Id0e90507fe9d45545ed3774521bac68eb0bda8a7
-rw-r--r--InCallUI/src/com/android/incallui/VideoCallPresenter.java9
1 files changed, 2 insertions, 7 deletions
diff --git a/InCallUI/src/com/android/incallui/VideoCallPresenter.java b/InCallUI/src/com/android/incallui/VideoCallPresenter.java
index 64f33231f..10cf11d64 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
@@ -671,9 +667,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) {