diff options
| -rw-r--r-- | telephony/java/android/telephony/ims/RcsConfig.aidl | 19 | ||||
| -rw-r--r-- | telephony/java/android/telephony/ims/RcsConfig.java | 6 |
2 files changed, 3 insertions, 22 deletions
diff --git a/telephony/java/android/telephony/ims/RcsConfig.aidl b/telephony/java/android/telephony/ims/RcsConfig.aidl deleted file mode 100644 index cfd93fbe2edb..000000000000 --- a/telephony/java/android/telephony/ims/RcsConfig.aidl +++ /dev/null @@ -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; diff --git a/telephony/java/android/telephony/ims/RcsConfig.java b/telephony/java/android/telephony/ims/RcsConfig.java index 6867c866cd94..fd8d8a76353b 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 |