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

Merge "Replace the hidden API to public API or other alternatives" into sc-dev am: 5467d0f7aa

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14173731

Change-Id: I1f0f0e4776c530a14caec54c905f477c6cef81c2
This commit is contained in:
TreeHugger Robot
2021-04-14 18:04:10 +00:00
committed by Automerger Merge Worker
parent 802222e5b3 5467d0f7aa
commit 3991ebebe2
7 changed files with 50 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tests/unit/src/com/android/settings/network/InternetUpdaterTest.java
View File

@@ -109,9 +109,10 @@ public class InternetUpdaterTest {
@Test
public void updateInternetAvailable_wifiConnectedAndNoValidated_internetUnavailable() {
final NetworkCapabilities networkCapabilities = new NetworkCapabilities();
networkCapabilities.addTransportType(TRANSPORT_WIFI);
networkCapabilities.addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET);
final NetworkCapabilities networkCapabilities = new NetworkCapabilities.Builder()
.addTransportType(TRANSPORT_WIFI)
.addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
.build();
mInternetUpdater.updateInternetAvailable(networkCapabilities);
@@ -120,10 +121,11 @@ public class InternetUpdaterTest {
@Test
public void updateInternetAvailable_wifiConnectedAndValidated_internetAvailable() {
final NetworkCapabilities networkCapabilities = new NetworkCapabilities();
networkCapabilities.addTransportType(TRANSPORT_WIFI);
networkCapabilities.addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET);
networkCapabilities.addCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED);
final NetworkCapabilities networkCapabilities = new NetworkCapabilities.Builder()
.addTransportType(TRANSPORT_WIFI)
.addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
.addCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED)
.build();
mInternetUpdater.updateInternetAvailable(networkCapabilities);

5
tests/unit/src/com/android/settings/network/ProviderModelSliceHelperTest.java
View File

@@ -99,7 +99,7 @@ public class ProviderModelSliceHelperTest {
MockitoAnnotations.initMocks(this);
mContext = spy(ApplicationProvider.getApplicationContext());
mBundle = new PersistableBundle();
mNetwork = new Network(anyInt());
mNetwork = mock(Network.class);
when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mSubscriptionManager);
when(mContext.getSystemService(CarrierConfigManager.class)).thenReturn(
@@ -288,7 +288,8 @@ public class ProviderModelSliceHelperTest {
}
private void addNetworkTransportType(int networkType) {
mNetworkCapabilities = new NetworkCapabilities().addTransportType(networkType);
mNetworkCapabilities = new NetworkCapabilities.Builder()
.addTransportType(networkType).build();
when(mConnectivityManager.getNetworkCapabilities(mNetwork)).thenReturn(
mNetworkCapabilities);
}

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

@@ -30,6 +30,8 @@ import static org.junit.Assert.assertTrue;
import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Mockito.CALLS_REAL_METHODS;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
@@ -121,7 +123,7 @@ public class MobileNetworkUtilsTest {
mCarrierConfig = new PersistableBundle();
when(mCarrierConfigManager.getConfigForSubId(SUB_ID_1)).thenReturn(mCarrierConfig);
mNetwork = new Network(anyInt());
mNetwork = mock(Network.class, CALLS_REAL_METHODS);
when(mContext.getSystemService(ConnectivityManager.class)).thenReturn(mConnectivityManager);
when(mConnectivityManager.getActiveNetwork()).thenReturn(mNetwork);
@@ -377,7 +379,8 @@ public class MobileNetworkUtilsTest {
}
private void addNetworkTransportType (int networkType) {
mNetworkCapabilities = new NetworkCapabilities().addTransportType(networkType);
mNetworkCapabilities = new NetworkCapabilities.Builder()
.addTransportType(networkType).build();
when(mConnectivityManager.getNetworkCapabilities(mNetwork)).thenReturn(
mNetworkCapabilities);
}