From b347e47aa698a2793e06e6022accac2f07c89cd9 Mon Sep 17 00:00:00 2001
From: donaldahn <donaldahn@google.com>
Date: Wed, 2 Mar 2022 03:39:22 +0000
Subject: [PATCH] [Telephony] remove the RuntimeException thrown

Bug: 196880723
Test: ATP apct/device_boot_health_check_extra
      TMUS-Repeated test to unregistermmtel after registration.
          Volte dials/disconnects, airplane mode on/off,
          Sim removed, power on/off

Merged-In: I050d4affd403604bdae21ef3bc7f9ddf93ffa9e4
Change-Id: I16ebfe7edb13e950afd835d64691d740b11cbcdc
---
 telephony/java/android/telephony/ims/ImsMmTelManager.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/telephony/java/android/telephony/ims/ImsMmTelManager.java b/telephony/java/android/telephony/ims/ImsMmTelManager.java
index 683bb92845baf..82d64abd373c0 100644
--- a/telephony/java/android/telephony/ims/ImsMmTelManager.java
+++ b/telephony/java/android/telephony/ims/ImsMmTelManager.java
@@ -618,9 +618,9 @@ public class ImsMmTelManager implements RegistrationManager {
 
         ITelephony iTelephony = getITelephony();
         if (iTelephony == null) {
-            throw new RuntimeException("Could not find Telephony Service.");
+            Log.w("ImsMmTelManager", "Could not find Telephony Service.");
+            return;
         }
-
         try {
             iTelephony.unregisterMmTelCapabilityCallback(mSubId, c.getBinder());
         } catch (RemoteException e) {