Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 65a24639 authored by Yorke Lee's avatar Yorke Lee Committed by Android Partner Code Review
Browse files

Merge "DO NOT MERGE Don't use internal resources in InCallUI" into m-wireless-dev

parents 844b3ba9 0db9323c

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

+2 −7
Original line number Diff line number Diff line
@@ -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) {