commit 8731af283440d7d74c21267c8c2b265a3bf456e5
author Joonhun Shin <joonhunshin@google.com> Fri Oct 27 00:03:50 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Oct 27 00:03:50 2023 +0000
tree 238be66af62f7d6c99317df4078aed685cbcacae
parent 3a937a63a986690547aec5221a8ca4229059f306
parent dda75c249b63b846e7430fa4a621bc1b3df19175

Merge "Fix call stuck in ringing state" into main

telephony/java/android/telephony/ims/ImsCallSession.java

diff --git a/telephony/java/android/telephony/ims/ImsCallSession.java b/telephony/java/android/telephony/ims/ImsCallSession.java
index ecd7039..d30078d 100755
--- a/telephony/java/android/telephony/ims/ImsCallSession.java
+++ b/telephony/java/android/telephony/ims/ImsCallSession.java
@@ -29,6 +29,7 @@
 
 import com.android.ims.internal.IImsCallSession;
 import com.android.ims.internal.IImsVideoCallProvider;
+import com.android.internal.telephony.flags.Flags;
 import com.android.internal.telephony.util.TelephonyUtils;
 
 import java.util.ArrayList;
@@ -545,6 +546,11 @@
             try {
                 iSession.setListener(mIImsCallSessionListenerProxy);
             } catch (RemoteException e) {
+                if (Flags.ignoreAlreadyTerminatedIncomingCallBeforeRegisteringListener()) {
+                    // Registering listener failed, so other operations are not allowed.
+                    Log.e(TAG, "ImsCallSession : " + e);
+                    mClosed = true;
+                }
             }
         } else {
             mClosed = true;