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

Commit 975d9e58 authored by Tyler Gunn's avatar Tyler Gunn Committed by Android (Google) Code Review
Browse files

Merge "API Cleanup: Remove references to VideoState class." into mnc-dev

parents 731a59fc 631ce4b4

src/java/com/android/internal/telephony/CallManager.java

+1 −1
Original line number Diff line number Diff line
@@ -741,7 +741,7 @@ public final class CallManager { 
        }



        // We only support the AUDIO_ONLY video state in this scenario.

        ringingPhone.acceptCall(VideoProfile.VideoState.AUDIO_ONLY);

        ringingPhone.acceptCall(VideoProfile.STATE_AUDIO_ONLY);



        if (VDBG) {

            Rlog.d(LOG_TAG, "End acceptCall(" +ringingCall + ")");

src/java/com/android/internal/telephony/PhoneBase.java

+3 −5
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


package com.android.internal.telephony;



import static com.android.internal.telephony.RILConstants.*;

import android.content.BroadcastReceiver;

import android.content.Context;

import android.content.Intent;
@@ -53,7 +52,6 @@ import com.android.internal.R; 
import com.android.internal.telephony.dataconnection.DcTrackerBase;

import com.android.internal.telephony.imsphone.ImsPhone;

import com.android.internal.telephony.imsphone.ImsPhoneConnection;

import com.android.internal.telephony.RadioCapability;

import com.android.internal.telephony.test.SimulatedRadioControl;

import com.android.internal.telephony.uicc.IccCardApplicationStatus.AppType;

import com.android.internal.telephony.uicc.IccFileHandler;
@@ -600,7 +598,7 @@ public abstract class PhoneBase extends Handler implements Phone { 
                    String dialString = (String) ar.result;

                    if (TextUtils.isEmpty(dialString)) return;

                    try {

                        dialInternal(dialString, null, VideoProfile.VideoState.AUDIO_ONLY);

                        dialInternal(dialString, null, VideoProfile.STATE_AUDIO_ONLY);

                    } catch (CallStateException e) {

                        Rlog.e(LOG_TAG, "silent redial failed: " + e);

                    }
@@ -1555,7 +1553,7 @@ public abstract class PhoneBase extends Handler implements Phone { 
    }



    private static int getVideoState(Call call) {

        int videoState = VideoProfile.VideoState.AUDIO_ONLY;

        int videoState = VideoProfile.STATE_AUDIO_ONLY;

        ImsPhoneConnection conn = (ImsPhoneConnection) call.getEarliestConnection();

        if (conn != null) {

            videoState = conn.getVideoState();
@@ -1565,7 +1563,7 @@ public abstract class PhoneBase extends Handler implements Phone { 


    private boolean isVideoCall(Call call) {

        int videoState = getVideoState(call);

        return (VideoProfile.VideoState.isVideo(videoState));

        return (VideoProfile.isVideo(videoState));

    }



    @Override

src/java/com/android/internal/telephony/gsm/GSMPhone.java

+1 −1
Original line number Diff line number Diff line
@@ -844,7 +844,7 @@ public class GSMPhone extends PhoneBase { 
        }



        if (LOCAL_DEBUG) Rlog.d(LOG_TAG, "Trying (non-IMS) CS call");

        return dialInternal(dialString, null, VideoProfile.VideoState.AUDIO_ONLY);

        return dialInternal(dialString, null, VideoProfile.STATE_AUDIO_ONLY);

    }



    @Override