Merge "Process rcsVolteSingleRegistration if it is not provided or roaming"

telephony/java/android/telephony/ims/RcsConfig.aidl

@@ -1,19 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.telephony.ims;
-
-parcelable RcsConfig;

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() {
+    public boolean isRcsVolteSingleRegistrationSupported(boolean isRoaming) {
-        return getBoolean(PARM_SINGLE_REGISTRATION, false)
+        int val = getInteger(PARM_SINGLE_REGISTRATION, 1);
-                || getInteger(PARM_SINGLE_REGISTRATION, 0) != 0;
+        return isRoaming ? val == 1 : val > 0;
     }
 
     @Override