commit 9bcb5cc9dade860f566242ff66af1e6c3a51e5b3
author Nazanin Bakhshi <nazaninb@google.com> Fri May 07 23:42:24 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri May 07 23:42:24 2021 +0000
tree c06bde56d7897514258239f4dbe528e2335374be
parent ca12d8e7fe63140367804e607c229c039853c512
parent 014f41e88780b8f437881bf2da6c136742894c46

Merge "Add telephony shell command for testing barring" into sc-dev

src/com/android/phone/RcsProvisioningMonitor.java

diff --git a/src/com/android/phone/RcsProvisioningMonitor.java b/src/com/android/phone/RcsProvisioningMonitor.java
index 9e30728..4c5a8e9 100644
--- a/src/com/android/phone/RcsProvisioningMonitor.java
+++ b/src/com/android/phone/RcsProvisioningMonitor.java
@@ -543,9 +543,13 @@
                     == ProvisioningManager.STATUS_CAPABLE) {
                 try {
                     RcsConfig rcsConfig = new RcsConfig(getConfig(subId));
-                    return rcsConfig.isRcsVolteSingleRegistrationSupported();
+                    return rcsConfig.isRcsVolteSingleRegistrationSupported(
+                            mPhone.getPhone(subId).getServiceState().getRoaming());
                 } catch (IllegalArgumentException e) {
                     logd("fail to get rcs config for sub:" + subId);
+                } catch (NullPointerException e) {
+                    // should not happen
+                    logd("fail to get roaming state for sub: " + subId);
                 }
             }
         }