Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resovle hidden connectivity methods usage in SystemUITests

Browse Source 
Connectivity hidden methods are no longer accessible outside
the module scope. Thus, replace the usage with equivalent
methods.

Bug: 182859030
Test: 1. remove framework-connectivity.impl from framework bp
      2. cd frameworks/base/packages/SystemUI/tests ; mm
      3. atest SystemUITests
Change-Id: Icfdcd983762eac788042e3d41db06597b69f3559
This commit is contained in:
Chiachang Wang
2021-04-15 13:50:13 +08:00
parent d6ea380f13
commit 490befc506
2 changed files with 37 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerBaseTest.java
View File

@@ -36,7 +36,6 @@ import static org.mockito.Mockito.when;
import android.app.Instrumentation; import android.app.Instrumentation;
import android.net.ConnectivityManager; import android.net.ConnectivityManager;
import android.net.LinkProperties;
import android.net.Network; import android.net.Network;
import android.net.NetworkCapabilities; import android.net.NetworkCapabilities;
import android.net.NetworkRequest; import android.net.NetworkRequest;
@@ -323,34 +322,37 @@ public class NetworkControllerBaseTest extends SysuiTestCase {
public void setConnectivityViaCallbackInNetworkControllerForVcn( public void setConnectivityViaCallbackInNetworkControllerForVcn(
int networkType, boolean validated, boolean isConnected, VcnTransportInfo info) { int networkType, boolean validated, boolean isConnected, VcnTransportInfo info) {
mNetCapabilities.setTransportInfo(info); final NetworkCapabilities.Builder builder =
setConnectivityCommon(networkType, validated, isConnected); new NetworkCapabilities.Builder(mNetCapabilities);
mDefaultCallbackInNetworkController.onCapabilitiesChanged( builder.setTransportInfo(info);
mNetwork, new NetworkCapabilities(mNetCapabilities)); setConnectivityCommon(builder, networkType, validated, isConnected);
mDefaultCallbackInNetworkController.onCapabilitiesChanged(mNetwork, builder.build());
} }
public void setConnectivityViaCallbackInNetworkController( public void setConnectivityViaCallbackInNetworkController(
int networkType, boolean validated, boolean isConnected, WifiInfo wifiInfo) { int networkType, boolean validated, boolean isConnected, WifiInfo wifiInfo) {
final NetworkCapabilities.Builder builder =
new NetworkCapabilities.Builder(mNetCapabilities);
if (networkType == NetworkCapabilities.TRANSPORT_WIFI) { if (networkType == NetworkCapabilities.TRANSPORT_WIFI) {
mNetCapabilities.setTransportInfo(wifiInfo); builder.setTransportInfo(wifiInfo);
} }
setConnectivityCommon(networkType, validated, isConnected); setConnectivityCommon(builder, networkType, validated, isConnected);
mDefaultCallbackInNetworkController.onCapabilitiesChanged( mDefaultCallbackInNetworkController.onCapabilitiesChanged(mNetwork, builder.build());
mNetwork, new NetworkCapabilities(mNetCapabilities));
} }
public void setConnectivityViaCallbackInWifiTracker( public void setConnectivityViaCallbackInWifiTracker(
int networkType, boolean validated, boolean isConnected, WifiInfo wifiInfo) { int networkType, boolean validated, boolean isConnected, WifiInfo wifiInfo) {
final NetworkCapabilities.Builder builder =
new NetworkCapabilities.Builder(mNetCapabilities);
if (networkType == NetworkCapabilities.TRANSPORT_WIFI) { if (networkType == NetworkCapabilities.TRANSPORT_WIFI) {
mNetCapabilities.setTransportInfo(wifiInfo); builder.setTransportInfo(wifiInfo);
} }
setConnectivityCommon(networkType, validated, isConnected); setConnectivityCommon(builder, networkType, validated, isConnected);
if (networkType == NetworkCapabilities.TRANSPORT_WIFI) { if (networkType == NetworkCapabilities.TRANSPORT_WIFI) {
if (isConnected) { if (isConnected) {
mNetworkCallback.onAvailable(mNetwork, final NetworkCapabilities newCap = builder.build();
new NetworkCapabilities(mNetCapabilities), new LinkProperties(), false); mNetworkCallback.onAvailable(mNetwork);
mNetworkCallback.onCapabilitiesChanged( mNetworkCallback.onCapabilitiesChanged(mNetwork, newCap);
mNetwork, new NetworkCapabilities(mNetCapabilities));
} else { } else {
mNetworkCallback.onLost(mNetwork); mNetworkCallback.onLost(mNetwork);
} }
@@ -359,16 +361,16 @@ public class NetworkControllerBaseTest extends SysuiTestCase {
public void setConnectivityViaCallbackInWifiTrackerForVcn( public void setConnectivityViaCallbackInWifiTrackerForVcn(
int networkType, boolean validated, boolean isConnected, VcnTransportInfo info) { int networkType, boolean validated, boolean isConnected, VcnTransportInfo info) {
mNetCapabilities.setTransportInfo(info); final NetworkCapabilities.Builder builder =
setConnectivityCommon(networkType, validated, isConnected); new NetworkCapabilities.Builder(mNetCapabilities);
builder.setTransportInfo(info);
setConnectivityCommon(builder, networkType, validated, isConnected);
if (networkType == NetworkCapabilities.TRANSPORT_CELLULAR) { if (networkType == NetworkCapabilities.TRANSPORT_CELLULAR) {
if (isConnected) { if (isConnected) {
mNetworkCallback.onAvailable(mNetwork, final NetworkCapabilities newCap = builder.build();
new NetworkCapabilities(mNetCapabilities), new LinkProperties(), false); mNetworkCallback.onAvailable(mNetwork);
mNetworkCallback.onCapabilitiesChanged( mNetworkCallback.onCapabilitiesChanged(mNetwork, newCap);
mNetwork, new NetworkCapabilities(mNetCapabilities)); mDefaultCallbackInWifiTracker.onCapabilitiesChanged(mNetwork, newCap);
mDefaultCallbackInWifiTracker.onCapabilitiesChanged(
mNetwork, new NetworkCapabilities(mNetCapabilities));
} else { } else {
mNetworkCallback.onLost(mNetwork); mNetworkCallback.onLost(mNetwork);
} }
@@ -377,26 +379,28 @@ public class NetworkControllerBaseTest extends SysuiTestCase {
public void setConnectivityViaDefaultCallbackInWifiTracker( public void setConnectivityViaDefaultCallbackInWifiTracker(
int networkType, boolean validated, boolean isConnected, WifiInfo wifiInfo) { int networkType, boolean validated, boolean isConnected, WifiInfo wifiInfo) {
final NetworkCapabilities.Builder builder =
new NetworkCapabilities.Builder(mNetCapabilities);
if (networkType == NetworkCapabilities.TRANSPORT_WIFI) { if (networkType == NetworkCapabilities.TRANSPORT_WIFI) {
mNetCapabilities.setTransportInfo(wifiInfo); builder.setTransportInfo(wifiInfo);
} }
setConnectivityCommon(networkType, validated, isConnected); setConnectivityCommon(builder, networkType, validated, isConnected);
mDefaultCallbackInWifiTracker.onCapabilitiesChanged( mDefaultCallbackInWifiTracker.onCapabilitiesChanged(
mNetwork, new NetworkCapabilities(mNetCapabilities)); mNetwork, builder.build());
} }
private void setConnectivityCommon( private static void setConnectivityCommon(NetworkCapabilities.Builder builder,
int networkType, boolean validated, boolean isConnected){ int networkType, boolean validated, boolean isConnected){
// TODO: Separate out into several NetworkCapabilities. // TODO: Separate out into several NetworkCapabilities.
if (isConnected) { if (isConnected) {
mNetCapabilities.addTransportType(networkType); builder.addTransportType(networkType);
} else { } else {
mNetCapabilities.removeTransportType(networkType); builder.removeTransportType(networkType);
} }
if (validated) { if (validated) {
mNetCapabilities.addCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED); builder.addCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED);
} else { } else {
mNetCapabilities.removeCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED); builder.removeCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED);
} }
} }

4
packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/SecurityControllerTest.java
View File

@@ -202,8 +202,8 @@ public class SecurityControllerTest extends SysuiTestCase {
@Test @Test
public void testNetworkRequest() { public void testNetworkRequest() {
verify(mConnectivityManager, times(1)).registerNetworkCallback(argThat( verify(mConnectivityManager, times(1)).registerNetworkCallback(argThat(
(NetworkRequest request) -> request.networkCapabilities.getUids() == null (NetworkRequest request) ->
&& request.networkCapabilities.getCapabilities().length == 0 request.equals(new NetworkRequest.Builder().clearCapabilities().build())
), any(NetworkCallback.class)); ), any(NetworkCallback.class));
} }