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

Commit 79e321b9 authored by Brad Ebinger's avatar Brad Ebinger Committed by Automerger Merge Worker
Browse files

Fix RTT NPE due to ImsCall#close being called am: fff67ce3 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/18973189



Change-Id: If0da7c1bceaae6e3c9311d6bb6cc142a4de72fba
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9470b6e2 fff67ce3

src/java/com/android/ims/ImsCall.java

+17 −2
Original line number Diff line number Diff line
@@ -1762,7 +1762,12 @@ public class ImsCall implements ICall { 
    public void sendRttMessage(String rttMessage) {

        synchronized(mLockObj) {

            if (mSession == null) {

                loge("sendRttMessage::no session");

                loge("sendRttMessage::no session, ignoring");

                return;

            }

            if (mCallProfile == null || mCallProfile.mMediaProfile == null)  {

                loge("sendRttMessage:: no valid call profile, ignoring");

                return;

            }

            if (!mCallProfile.mMediaProfile.isRttCall()) {

                logi("sendRttMessage::Not an rtt call, ignoring");
@@ -1781,7 +1786,12 @@ public class ImsCall implements ICall { 


        synchronized(mLockObj) {

            if (mSession == null) {

                loge("sendRttModifyRequest::no session");

                loge("sendRttModifyRequest::no session, ignoring");

                return;

            }

            if (mCallProfile == null || mCallProfile.mMediaProfile == null)  {

                loge("sendRttModifyRequest:: no valid call profile, ignoring");

                return;

            }

            if (rttOn && mCallProfile.mMediaProfile.isRttCall()) {

                logi("sendRttModifyRequest::Already RTT call, ignoring request to turn on.");
@@ -1815,6 +1825,11 @@ public class ImsCall implements ICall { 
        synchronized(mLockObj) {

            if (mSession == null) {

                loge("sendRttModifyResponse::no session");

                return;

            }

            if (mCallProfile == null || mCallProfile.mMediaProfile == null)  {

                loge("sendRttModifyResponse:: no valid call profile, ignoring");

                return;

            }

            if (mCallProfile.mMediaProfile.isRttCall()) {

                logi("sendRttModifyResponse::Already RTT call, ignoring.");