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

This commit is contained in:
Hui Wang
2021-06-22 14:48:19 +00:00
committed by Gerrit Code Review
2 changed files with 3 additions and 22 deletions

View File

@@ -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;

View File

@@ -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