commit 857ef4b6ba657f4a28e2fb4375609cf0a670ee5f
author joonhunshin <joonhunshin@google.com> Fri Dec 01 07:31:53 2023 +0000
committer Joonhun Shin <joonhunshin@google.com> Tue Dec 26 03:31:15 2023 +0000
tree 8bcc4192b11b13872eb3fa643b4f0a350abe3131
parent 6a8e727cdf1426cb91f91cde629dbf7d498b26d4

Data only device(without FEATURE_TELEPHON_CALLING/IMS) : Add try/catch to handle UnsupportedOperationException

If the device does not have Telephony feature calling, the some of interfaces in TelephonyManager throw UnsupportedOperationException.
Fix presubmit slience crash

Bug: 297989574
Test: oriole with ATT SIM, boot completed
      APM/data/wifi on/off
Change-Id: I80e772eed11a424193603580119604881d6a3032

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 8f3281c..210e0ab 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -7816,8 +7816,9 @@
         try {
             boolean isCarrierSupported = mApp.getCarrierConfigForSubId(subscriptionId).getBoolean(
                     CarrierConfigManager.KEY_RTT_SUPPORTED_BOOL);
-            boolean isDeviceSupported =
-                    phone.getContext().getResources().getBoolean(R.bool.config_support_rtt);
+            boolean isDeviceSupported = (phone.getContext().getResources() != null)
+                    ? phone.getContext().getResources().getBoolean(R.bool.config_support_rtt)
+                    : false;
             return isCarrierSupported && isDeviceSupported;
         } finally {
             Binder.restoreCallingIdentity(identity);
@@ -7832,6 +7833,12 @@
     public boolean isRttEnabled(int subscriptionId) {
         final long identity = Binder.clearCallingIdentity();
         try {
+            if (mFeatureFlags.enforceTelephonyFeatureMappingForPublicApis()) {
+                if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY_IMS)) {
+                    return false;
+                }
+            }
+
             boolean isRttSupported = isRttSupported(subscriptionId);
             boolean isUserRttSettingOn = Settings.Secure.getInt(
                     mApp.getContentResolver(), Settings.Secure.RTT_CALLING_MODE, 0) != 0;