From 82b59178a477cb258073e74ad5b96c4accc13aa8 Mon Sep 17 00:00:00 2001
From: Hui Wang <huiwang@google.com>
Date: Wed, 5 May 2021 17:13:35 -0700
Subject: [PATCH] Process rcsVolteSingleRegistration if it is not provided or
 roaming

Bug: 186884505
Test: atest TeleServiceTests:com.android.phone.RcsProvisioningMonitorTest
Test: atest FrameworksTelephonyTests:com.telephony.ims.RcsConfigTest
Change-Id: I800ba7cfda4fdd9bd2590a12c23c33ee72b07396
---
 telephony/java/android/telephony/ims/RcsConfig.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/telephony/java/android/telephony/ims/RcsConfig.java b/telephony/java/android/telephony/ims/RcsConfig.java
index 6867c866cd947..fd8d8a76353b0 100644
--- a/telephony/java/android/telephony/ims/RcsConfig.java
+++ b/telephony/java/android/telephony/ims/RcsConfig.java
@@ -357,9 +357,9 @@ public final class RcsConfig {
     /**
      * Check whether Rcs Volte single registration is supported by the config.
      */
-    public boolean isRcsVolteSingleRegistrationSupported() {
-        return getBoolean(PARM_SINGLE_REGISTRATION, false)
-                || getInteger(PARM_SINGLE_REGISTRATION, 0) != 0;
+    public boolean isRcsVolteSingleRegistrationSupported(boolean isRoaming) {
+        int val = getInteger(PARM_SINGLE_REGISTRATION, 1);
+        return isRoaming ? val == 1 : val > 0;
     }
 
     @Override