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

Commit 8ba4163f authored by Hall Liu's avatar Hall Liu Committed by android-build-merger
Browse files

Merge "Fix RTT property setting" 

am: ccb453dd

Change-Id: Ia165116186bb24081521f33deb0c159d572b5692
parents db659f8a ccb453dd

src/java/com/android/internal/telephony/imsphone/ImsPhoneCallTracker.java

+0 −4
Original line number Diff line number Diff line
@@ -2670,10 +2670,6 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall { 
            ImsPhoneConnection conn = findConnection(imsCall);

            if (conn != null) {

                conn.onRttModifyResponseReceived(status);

                if (status ==

                        android.telecom.Connection.RttModifyStatus.SESSION_MODIFY_REQUEST_SUCCESS) {

                    conn.startRttTextProcessing();

                }

            }

        }

src/java/com/android/internal/telephony/imsphone/ImsPhoneConnection.java

+2 −3
Original line number Diff line number Diff line
@@ -33,12 +33,12 @@ import android.telephony.DisconnectCause; 
import android.telephony.PhoneNumberUtils;

import android.telephony.Rlog;

import android.telephony.ServiceState;

import android.telephony.ims.ImsCallProfile;

import android.telephony.ims.ImsStreamMediaProfile;

import android.text.TextUtils;



import com.android.ims.ImsCall;

import android.telephony.ims.ImsCallProfile;

import com.android.ims.ImsException;

import android.telephony.ims.ImsStreamMediaProfile;

import com.android.ims.internal.ImsVideoCallProviderWrapper;

import com.android.internal.telephony.CallStateException;

import com.android.internal.telephony.Connection;
@@ -985,7 +985,6 @@ public class ImsPhoneConnection extends Connection implements 
        imsCall.sendRttModifyResponse(accept);

        if (accept) {

            setCurrentRttTextStream(textStream);

            startRttTextProcessing();

        } else {

            Rlog.e(LOG_TAG, "sendRttModifyResponse: foreground call has no connections");

        }