Merge "[VCN06] Support request background network"
This commit is contained in:
@@ -32,6 +32,7 @@ import static android.net.NetworkCapabilities.TRANSPORT_BLUETOOTH;
|
||||
import static android.net.NetworkCapabilities.TRANSPORT_CELLULAR;
|
||||
import static android.net.NetworkCapabilities.TRANSPORT_ETHERNET;
|
||||
import static android.net.NetworkCapabilities.TRANSPORT_WIFI;
|
||||
import static android.net.NetworkRequest.Type.BACKGROUND_REQUEST;
|
||||
import static android.net.NetworkRequest.Type.REQUEST;
|
||||
import static android.net.NetworkRequest.Type.TRACK_DEFAULT;
|
||||
|
||||
@@ -368,6 +369,12 @@ public class ConnectivityManagerTest {
|
||||
eq(TRACK_DEFAULT.ordinal()), any(), anyInt(), any(), eq(TYPE_NONE),
|
||||
eq(testPkgName), eq(null));
|
||||
reset(mService);
|
||||
|
||||
manager.requestBackgroundNetwork(request, null, callback);
|
||||
verify(mService).requestNetwork(eq(request.networkCapabilities),
|
||||
eq(BACKGROUND_REQUEST.ordinal()), any(), anyInt(), any(), eq(TYPE_NONE),
|
||||
eq(testPkgName), eq(null));
|
||||
reset(mService);
|
||||
}
|
||||
|
||||
static Message makeMessage(NetworkRequest req, int messageType) {
|
||||
|
||||
@@ -3678,10 +3678,13 @@ public class ConnectivityServiceTest {
|
||||
|
||||
@Test
|
||||
public void testBackgroundNetworks() throws Exception {
|
||||
// Create a background request. We can't do this ourselves because ConnectivityService
|
||||
// doesn't have an API for it. So just turn on mobile data always on.
|
||||
setAlwaysOnNetworks(true);
|
||||
// Create a cellular background request.
|
||||
grantUsingBackgroundNetworksPermissionForUid(Binder.getCallingUid());
|
||||
final TestNetworkCallback cellBgCallback = new TestNetworkCallback();
|
||||
mCm.requestBackgroundNetwork(new NetworkRequest.Builder()
|
||||
.addTransportType(TRANSPORT_CELLULAR).build(), null, cellBgCallback);
|
||||
|
||||
// Make callbacks for monitoring.
|
||||
final NetworkRequest request = new NetworkRequest.Builder().build();
|
||||
final NetworkRequest fgRequest = new NetworkRequest.Builder()
|
||||
.addCapability(NET_CAPABILITY_FOREGROUND).build();
|
||||
@@ -3750,6 +3753,7 @@ public class ConnectivityServiceTest {
|
||||
|
||||
mCm.unregisterNetworkCallback(callback);
|
||||
mCm.unregisterNetworkCallback(fgCallback);
|
||||
mCm.unregisterNetworkCallback(cellBgCallback);
|
||||
}
|
||||
|
||||
@Ignore // This test has instrinsic chances of spurious failures: ignore for continuous testing.
|
||||
|
||||
Reference in New Issue
Block a user