PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[Settings] Remove WFC enabled state condition of querying Telecomm." into udc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2023-05-04 14:57:36 +00:00
committed by Android (Google) Code Review
parent 3f4820bdf1 21860761e8
commit 3a2b8e81e5
5 changed files with 14 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/com/android/settings/network/telephony/MobileNetworkUtils.java
View File

@@ -940,28 +940,11 @@ public class MobileNetworkUtils {
* Copied from WifiCallingPreferenceController#isWifiCallingEnabled()
*/
public static boolean isWifiCallingEnabled(Context context, int subId,
@Nullable WifiCallingQueryImsState queryImsState,
@Nullable PhoneAccountHandle phoneAccountHandle) {
if (phoneAccountHandle == null){
phoneAccountHandle = context.getSystemService(TelecomManager.class)
.getSimCallManagerForSubscription(subId);
@Nullable WifiCallingQueryImsState queryImsState) {
if (queryImsState == null) {
queryImsState = new WifiCallingQueryImsState(context, subId);
}
boolean isWifiCallingEnabled;
if (phoneAccountHandle != null) {
final Intent intent = buildPhoneAccountConfigureIntent(context, phoneAccountHandle);
if (intent == null) {
Log.d(TAG, "Can not get phoneAccount configure intent.");
isWifiCallingEnabled = false;
} else {
isWifiCallingEnabled = true;
}
} else {
if (queryImsState == null) {
queryImsState = new WifiCallingQueryImsState(context, subId);
}
isWifiCallingEnabled = queryImsState.isReadyToWifiCalling();
}
return isWifiCallingEnabled;
return queryImsState.isReadyToWifiCalling();
}
/**

4
src/com/android/settings/network/telephony/NetworkProviderWifiCallingGroup.java
View File

@@ -22,7 +22,6 @@ import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
import android.os.PersistableBundle;
import android.provider.Settings;
import android.telecom.PhoneAccountHandle;
import android.telecom.TelecomManager;
@@ -314,8 +313,7 @@ public class NetworkProviderWifiCallingGroup extends
@VisibleForTesting
protected boolean shouldShowWifiCallingForSub(int subId) {
if (SubscriptionManager.isValidSubscriptionId(subId)
&& MobileNetworkUtils.isWifiCallingEnabled(mContext, subId, queryImsState(subId),
null)) {
&& MobileNetworkUtils.isWifiCallingEnabled(mContext, subId, queryImsState(subId))) {
return true;
}
return false;

2
src/com/android/settings/network/telephony/WifiCallingPreferenceController.java
View File

@@ -71,7 +71,7 @@ public class WifiCallingPreferenceController extends TelephonyBasePreferenceCont
@Override
public int getAvailabilityStatus(int subId) {
return SubscriptionManager.isValidSubscriptionId(subId)
&& MobileNetworkUtils.isWifiCallingEnabled(mContext, subId, null, null)
&& MobileNetworkUtils.isWifiCallingEnabled(mContext, subId, null)
? AVAILABLE
: UNSUPPORTED_ON_DEVICE;
}

6
src/com/android/settings/wifi/calling/WifiCallingSettings.java
View File

@@ -257,8 +257,10 @@ public class WifiCallingSettings extends SettingsPreferenceFragment
for (SubscriptionInfo subInfo : subInfoList) {
int subId = subInfo.getSubscriptionId();
try {
if (MobileNetworkUtils.isWifiCallingEnabled(getContext(), subId,
queryImsState(subId), null)) {
if (MobileNetworkUtils.isWifiCallingEnabled(
getContext(),
subId,
queryImsState(subId))) {
selectedList.add(subInfo);
}
} catch (Exception exception) {}

24
tests/unit/src/com/android/settings/network/telephony/MobileNetworkUtilsTest.java
View File

@@ -385,35 +385,19 @@ public class MobileNetworkUtilsTest {
}
@Test
public void isWifiCallingEnabled_hasPhoneAccountHandleAndHasActivityHandleIntent_returnTrue() {
buildPhoneAccountConfigureIntent(true);
assertTrue(MobileNetworkUtils.isWifiCallingEnabled(mContext, SUB_ID_1,
null, mPhoneAccountHandle));
}
@Test
public void isWifiCallingEnabled_hasPhoneAccountHandleAndNoActivityHandleIntent_returnFalse() {
buildPhoneAccountConfigureIntent(false);
assertFalse(MobileNetworkUtils.isWifiCallingEnabled(mContext, SUB_ID_1,
null, mPhoneAccountHandle));
}
@Test
public void isWifiCallingEnabled_noPhoneAccountHandleAndWifiCallingIsReady_returnTrue() {
public void isWifiCallingEnabled_wifiCallingIsReady_returnTrue() {
setWifiCallingEnabled(true);
assertTrue(MobileNetworkUtils.isWifiCallingEnabled(mContext, SUB_ID_1,
mMockQueryWfcState, null));
mMockQueryWfcState));
}
@Test
public void isWifiCallingEnabled_noPhoneAccountHandleAndWifiCallingNotReady_returnFalse() {
public void isWifiCallingEnabled_wifiCallingNotReady_returnFalse() {
setWifiCallingEnabled(false);
assertFalse(MobileNetworkUtils.isWifiCallingEnabled(mContext, SUB_ID_1,
mMockQueryWfcState, null));
mMockQueryWfcState));
}
private void setWifiCallingEnabled(boolean enabled){