am 8c04baef: am e287a5c6: Merge "CTS: verify ConnectivityManager.requestNetwork throws for restricted networks" into lmp-dev
* commit '8c04baef4cb8066712c6b1af345781b41a17aa8a': CTS: verify ConnectivityManager.requestNetwork throws for restricted networks
This commit is contained in:
@@ -16,16 +16,21 @@
|
|||||||
|
|
||||||
package android.net.cts;
|
package android.net.cts;
|
||||||
|
|
||||||
|
import static android.net.NetworkCapabilities.NET_CAPABILITY_IMS;
|
||||||
|
import static android.net.NetworkCapabilities.NET_CAPABILITY_INTERNET;
|
||||||
|
|
||||||
import android.content.BroadcastReceiver;
|
import android.content.BroadcastReceiver;
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
import android.content.IntentFilter;
|
import android.content.IntentFilter;
|
||||||
import android.content.pm.PackageManager;
|
import android.content.pm.PackageManager;
|
||||||
import android.net.ConnectivityManager;
|
import android.net.ConnectivityManager;
|
||||||
|
import android.net.ConnectivityManager.NetworkCallback;
|
||||||
import android.net.NetworkConfig;
|
import android.net.NetworkConfig;
|
||||||
import android.net.NetworkInfo;
|
import android.net.NetworkInfo;
|
||||||
import android.net.NetworkInfo.DetailedState;
|
import android.net.NetworkInfo.DetailedState;
|
||||||
import android.net.NetworkInfo.State;
|
import android.net.NetworkInfo.State;
|
||||||
|
import android.net.NetworkRequest;
|
||||||
import android.net.wifi.WifiManager;
|
import android.net.wifi.WifiManager;
|
||||||
import android.test.AndroidTestCase;
|
import android.test.AndroidTestCase;
|
||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
@@ -343,4 +348,23 @@ public class ConnectivityManagerTest extends AndroidTestCase {
|
|||||||
return mReceiveLatch.await(30, TimeUnit.SECONDS);
|
return mReceiveLatch.await(30, TimeUnit.SECONDS);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** Verify restricted networks cannot be requested. */
|
||||||
|
public void testRestrictedNetworks() {
|
||||||
|
// Verify we can request unrestricted networks:
|
||||||
|
NetworkRequest request = new NetworkRequest.Builder()
|
||||||
|
.addCapability(NET_CAPABILITY_INTERNET).build();
|
||||||
|
NetworkCallback callback = new NetworkCallback();
|
||||||
|
mCm.requestNetwork(request, callback);
|
||||||
|
mCm.unregisterNetworkCallback(callback);
|
||||||
|
// Verify we cannot request restricted networks:
|
||||||
|
request = new NetworkRequest.Builder().addCapability(NET_CAPABILITY_IMS).build();
|
||||||
|
callback = new NetworkCallback();
|
||||||
|
try {
|
||||||
|
mCm.requestNetwork(request, callback);
|
||||||
|
fail("No exception thrown when restricted network requested.");
|
||||||
|
} catch (SecurityException e) {
|
||||||
|
// Expected.
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user