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

Fix WiFi calling option is showing in search result regardless the carrier supports VoWiFi or not

Browse Source 
Change Availability Status to UNSUPPORTED_ON_DEVICE when device doesn't
support VoWiFi.

Change-Id: I8ac501cf7442f1cd7d41f61d2db912d82a9e8c25
Fixes: 120806624
Test: manual and robotests
This commit is contained in:
Stanley Wang
2018-12-28 18:39:47 +08:00
parent 637c874dff
commit 242502e5a9
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -72,7 +72,7 @@ public class WifiCallingPreferenceController extends BasePreferenceController im
&& MobileNetworkUtils.isWifiCallingEnabled(mContext, && MobileNetworkUtils.isWifiCallingEnabled(mContext,
SubscriptionManager.getPhoneId(mSubId)) SubscriptionManager.getPhoneId(mSubId))
? AVAILABLE ? AVAILABLE
: CONDITIONALLY_UNAVAILABLE; : UNSUPPORTED_ON_DEVICE;
} }
@Override @Override

9
tests/robotests/src/com/android/settings/network/telephony/WifiCallingPreferenceControllerTest.java
View File

@@ -32,6 +32,7 @@ import androidx.preference.PreferenceScreen;
import com.android.ims.ImsConfig; import com.android.ims.ImsConfig;
import com.android.ims.ImsManager; import com.android.ims.ImsManager;
import com.android.settings.core.BasePreferenceController;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
@@ -109,4 +110,12 @@ public class WifiCallingPreferenceControllerTest {
assertThat(mPreferenceCategory.isVisible()).isFalse(); assertThat(mPreferenceCategory.isVisible()).isFalse();
} }
@Test
public void getAvailabilityStatus_noWiFiCalling_shouldReturnUnsupported() {
mController.init(SubscriptionManager.INVALID_SUBSCRIPTION_ID);
assertThat(mController.getAvailabilityStatus()).isEqualTo(
BasePreferenceController.UNSUPPORTED_ON_DEVICE);
}
} }