commit c73e22026afc6a10714ef856d4e7e755fa310850
author Jihoon Kang <jihoonkang@google.com> Fri Aug 30 18:41:33 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Aug 30 18:41:33 2024 +0000
tree 0ec85a518a0b05fdca39efcfcd06974128a2ef18
parent 1afbf33b7694856ee420f4e6b30eafb40b73d804
parent 04c737c1d4888e093ab167dff92d0103df6482e7

Make java_sdk_library dependencies explicit am: 04c737c1d4

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Telephony/+/3248210

Change-Id: I9ee5b5586167826450de61c7120a507ce986f38b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

services/QualifiedNetworksService/src/com/android/telephony/qns/QnsImsManager.java

diff --git a/services/QualifiedNetworksService/src/com/android/telephony/qns/QnsImsManager.java b/services/QualifiedNetworksService/src/com/android/telephony/qns/QnsImsManager.java
index cefcd5c..6a7c0c6 100644
--- a/services/QualifiedNetworksService/src/com/android/telephony/qns/QnsImsManager.java
+++ b/services/QualifiedNetworksService/src/com/android/telephony/qns/QnsImsManager.java
@@ -246,7 +246,7 @@
                 log("startTrackingImsRegistration: registered MMTEL registration callback");
                 mMmtelImsRegistrationCallback = imsRegistrationCallback;
             } catch (ImsException e) {
-                loge("startTrackingImsRegistration: couldn't register MMTEL callback, " + e);
+                loge("registerImsRegistrationCallback: couldn't register MMTEL callback, " + e);
             }
         }
 
@@ -281,6 +281,8 @@
                 mRcsSipDialogSessionStateCallback = rcsSipDialogStateCallback;
             } catch (ImsException e) {
                 loge("startTrackingSipDialogSessionState: couldn't register callback, " + e);
+            } catch (UnsupportedOperationException e) {
+                loge("registerSipDialogStateCallback: couldn't register callback, " + e);
             }
         }
     }
@@ -598,7 +600,9 @@
 
         if (imsAvailable) {
             startTrackingImsRegistration(imsFeature);
-            startTrackingSipDialogSessionState(imsFeature);
+            if (imsFeature == ImsFeature.FEATURE_RCS) {
+                startTrackingSipDialogSessionState(imsFeature);
+            }
         }
 
         ImsState imsState = new ImsState(imsAvailable);