[Settings] replace isNonTtyOrTtyOnVolteEnabled() and isWfcEnabledByUser() in WFC

1. Code refactor
2. Replace ImsManager#isNonTtyOrTtyOnVolteEnabled() by combination of
   TelecomManager#getCurrentTtyMode() and
   ImsMmTelManager#isTtyOverVolteEnabled()
3. Replace ImsManager#isWfcEnabledByUser() by
ImsMmTelManager#isVoWiFiSettingEnabled()

Bug: 140542283
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=WifiCallingSettingsForSubTest
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=WifiCallingSliceHelperTest
Change-Id: I57c91a095fc4d454d92e8d78e0b647b4f098c6a3
This commit is contained in:
Bonian Chen
2020-01-21 23:10:17 +08:00
parent ff1863451f
commit c4413a850f
4 changed files with 79 additions and 33 deletions

View File

@@ -0,0 +1,46 @@
/*
* 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 com.android.settings.network.ims;
import android.telephony.ims.ImsMmTelManager;
/**
* An {@code ImsQuery} for accessing IMS WFC enabled settings from user
*/
public class ImsQueryWfcUserSetting extends ImsDirectQueryImpl {
/**
* Constructor
* @param subId subscription id
*/
public ImsQueryWfcUserSetting(int subId) {
mSubId = subId;
}
private volatile int mSubId;
/**
* Query running within a {@code Callable}
*
* @return result of query
*/
public Boolean call() {
final ImsMmTelManager imsMmTelManager = ImsMmTelManager.createForSubscriptionId(mSubId);
return imsMmTelManager.isVoWiFiSettingEnabled();
}
}

View File

@@ -19,8 +19,7 @@ package com.android.settings.network.ims;
import android.content.Context;
import android.telephony.SubscriptionManager;
import com.android.ims.ImsManager;
import com.android.settings.network.SubscriptionUtil;
import androidx.annotation.VisibleForTesting;
/**
* Controller class for querying Wifi calling status
@@ -41,6 +40,14 @@ public class WifiCallingQueryImsState extends ImsQueryController {
mSubId = subId;
}
/**
* Implementation of ImsQueryController#isEnabledByUser(int subId)
*/
@VisibleForTesting
ImsDirectQuery isEnabledByUser(int subId) {
return new ImsQueryWfcUserSetting(subId);
}
/**
* Get allowance status for user to alter configuration
*
@@ -64,8 +71,6 @@ public class WifiCallingQueryImsState extends ImsQueryController {
if (!SubscriptionManager.isValidSubscriptionId(mSubId)) {
return false;
}
ImsManager imsManager = ImsManager.getInstance(mContext, SubscriptionUtil.getPhoneId(
mContext, mSubId));
return imsManager.isWfcEnabledByUser();
return isEnabledByUser(mSubId).directQuery();
}
}