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

Replace the hidden API to public API or other alternatives

Browse Source 
Some of connectivity related files are going to be a part of
mainline module, so the external callers cannot call its hidden
API.
Replace the hidden API to public API or other alternatives from
the callers side.

Bug: 182859030
Test: 1. Remove "framework-connectivity.impl"
      2. atest SettingsUnitTests:InternetUpdaterTest
      3. atest SettingsUnitTests:ProviderModelSliceHelperTest
      4. atest SettingsUnitTests:MobileNetworkUtilsTest
      5. make RunSettingsRoboTests \
         ROBOTEST_FILTER=AppDataUsagePreferenceControllerTest
      6. make RunSettingsRoboTests \
         ROBOTEST_FILTER=TetherPreferenceControllerTest
      7. make RunSettingsRoboTests \
         ROBOTEST_FILTER=WifiDetailPreferenceController2Test
      8. make RunSettingsRoboTests \
         ROBOTEST_FILTER=ContextualWifiSliceTest
Change-Id: Idd1ca57d8f2790070e9c401936c5af2a05bcfe9d
This commit is contained in:
lucaslin
2021-04-14 16:50:53 +08:00
committed by Lucas Lin
parent 4400038635
commit 09bbb51d29
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);
}