[Provider Model] Show carrier network to internet preference

- If the connected network is the merged carrier Wi-Fi, then show
carrier network to internet prefernce.

Bug: 191091045
Test: manual test
atest -c InternetUpdaterTest

Change-Id: Iad3869f086ea0a4d0607691c6709ee12567831c7
This commit is contained in:
Weng Su
2021-06-22 23:06:45 +08:00
parent 49bf60df47
commit 627efc46a2
2 changed files with 27 additions and 0 deletions

View File

@@ -39,6 +39,7 @@ import android.content.Context;
import android.content.IntentFilter;
import android.net.ConnectivityManager;
import android.net.NetworkCapabilities;
import android.net.wifi.WifiInfo;
import android.net.wifi.WifiManager;
import androidx.lifecycle.Lifecycle;
@@ -194,4 +195,17 @@ public class InternetUpdaterTest {
assertThat(mInternetUpdater.getInternetType()).isEqualTo(INTERNET_ETHERNET);
}
@Test
public void updateInternetType_carrierWifiConnected_getInternetCellular() {
final WifiInfo wifiInfo = mock(WifiInfo.class);
doReturn(wifiInfo).when(mWifiManager).getConnectionInfo();
doReturn(true).when(wifiInfo).isCarrierMerged();
mInternetUpdater.mInternetAvailable = true;
mInternetUpdater.mTransport = TRANSPORT_WIFI;
mInternetUpdater.updateInternetType();
assertThat(mInternetUpdater.getInternetType()).isEqualTo(INTERNET_CELLULAR);
}
}