am 006494e5: Merge "Fix Broken PaintTest#testBreakText1" into gingerbread
* commit '006494e5183fa3fef09b6fa463a4bdaca677e059':
Fix Broken PaintTest#testBreakText1
Test startUsingNetworkFeature TYPE_MOBILE_HIPRI
Increase height and width of the status bar to accommodate higher resolution devices
Update BuildVersionTest for 2.2.2
Update BuildVersionTest for 2.2 and 2.2.1
Fix DX Tests Compilation Script
Changing the delay time from 250ms to 3000ms, because avoiding a race condition in testOnReceivedIcon.
CTS test is not considering the case when the devcie get into SILENT mode by volume down key.
Revert "fix keytests for azerty keyboard"
diff --git a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
index 17a3ac1..be47953 100644
--- a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
+++ b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
@@ -16,26 +16,43 @@
package android.net.cts;
+import com.android.internal.telephony.Phone;
+
import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestTargets;
import dalvik.annotation.ToBeFixed;
+import android.content.BroadcastReceiver;
import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.pm.PackageManager;
import android.net.ConnectivityManager;
import android.net.NetworkInfo;
import android.net.NetworkInfo.DetailedState;
import android.net.NetworkInfo.State;
+import android.net.wifi.WifiManager;
import android.test.AndroidTestCase;
+import android.util.Log;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
@TestTargetClass(ConnectivityManager.class)
public class ConnectivityManagerTest extends AndroidTestCase {
+ private static final String TAG = ConnectivityManagerTest.class.getSimpleName();
+
+ private static final String FEATURE_ENABLE_HIPRI = "enableHIPRI";
+
public static final int TYPE_MOBILE = ConnectivityManager.TYPE_MOBILE;
public static final int TYPE_WIFI = ConnectivityManager.TYPE_WIFI;
private static final int HOST_ADDRESS = 0x7f000001;// represent ip 127.0.0.1
private ConnectivityManager mCm;
+ private WifiManager mWifiManager;
+ private PackageManager mPackageManager;
// must include both mobile data + wifi
private static final int MIN_NUM_NETWORK_TYPES = 2;
@@ -43,6 +60,8 @@
protected void setUp() throws Exception {
super.setUp();
mCm = (ConnectivityManager) getContext().getSystemService(Context.CONNECTIVITY_SERVICE);
+ mWifiManager = (WifiManager) getContext().getSystemService(Context.WIFI_SERVICE);
+ mPackageManager = getContext().getPackageManager();
}
@TestTargetNew(
@@ -174,4 +193,91 @@
public void testTest() {
mCm.getBackgroundDataSetting();
}
+
+ /** Test that hipri can be brought up when Wifi is enabled. */
+ public void testStartUsingNetworkFeature_enableHipri() throws Exception {
+ if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)
+ || !mPackageManager.hasSystemFeature(PackageManager.FEATURE_WIFI)) {
+ // This test requires a mobile data connection and WiFi.
+ return;
+ }
+
+ boolean isWifiConnected = mWifiManager.isWifiEnabled()
+ && mWifiManager.getConnectionInfo().getSSID() != null;
+
+ try {
+ // Make sure WiFi is connected to an access point.
+ if (!isWifiConnected) {
+ connectToWifi();
+ }
+
+ // Register a receiver that will capture the connectivity change for hipri.
+ ConnectivityActionReceiver receiver =
+ new ConnectivityActionReceiver(ConnectivityManager.TYPE_MOBILE_HIPRI);
+ IntentFilter filter = new IntentFilter();
+ filter.addAction(ConnectivityManager.CONNECTIVITY_ACTION);
+ mContext.registerReceiver(receiver, filter);
+
+ // Try to start using the hipri feature...
+ int result = mCm.startUsingNetworkFeature(ConnectivityManager.TYPE_MOBILE,
+ FEATURE_ENABLE_HIPRI);
+ assertTrue("Couldn't start using the HIPRI feature.", result != -1);
+
+ // Check that the ConnectivityManager reported that it connected using hipri...
+ assertTrue("Couldn't connect using hipri...", receiver.waitForConnection());
+
+ assertTrue("Couldn't requestRouteToHost using HIPRI.",
+ mCm.requestRouteToHost(ConnectivityManager.TYPE_MOBILE_HIPRI, HOST_ADDRESS));
+
+ } catch (InterruptedException e) {
+ fail("Broadcast receiver waiting for ConnectivityManager interrupted.");
+ } finally {
+ mCm.stopUsingNetworkFeature(ConnectivityManager.TYPE_MOBILE,
+ Phone.FEATURE_ENABLE_HIPRI);
+ if (!isWifiConnected) {
+ mWifiManager.setWifiEnabled(false);
+ }
+ }
+ }
+
+ private void connectToWifi() throws InterruptedException {
+ ConnectivityActionReceiver receiver =
+ new ConnectivityActionReceiver(ConnectivityManager.TYPE_WIFI);
+ IntentFilter filter = new IntentFilter();
+ filter.addAction(ConnectivityManager.CONNECTIVITY_ACTION);
+ mContext.registerReceiver(receiver, filter);
+
+ assertTrue(mWifiManager.setWifiEnabled(true));
+ assertTrue("Wifi must be configured to connect to an access point for this test.",
+ receiver.waitForConnection());
+
+ mContext.unregisterReceiver(receiver);
+ }
+
+ /** Receiver that captures the last connectivity change's network type and state. */
+ private class ConnectivityActionReceiver extends BroadcastReceiver {
+
+ private final CountDownLatch mReceiveLatch = new CountDownLatch(1);
+
+ private final int mNetworkType;
+
+ ConnectivityActionReceiver(int networkType) {
+ mNetworkType = networkType;
+ }
+
+ public void onReceive(Context context, Intent intent) {
+ NetworkInfo networkInfo = intent.getExtras()
+ .getParcelable(ConnectivityManager.EXTRA_NETWORK_INFO);
+ int networkType = networkInfo.getType();
+ State networkState = networkInfo.getState();
+ Log.i(TAG, "Network type: " + networkType + " state: " + networkState);
+ if (networkType == mNetworkType && networkInfo.getState() == State.CONNECTED) {
+ mReceiveLatch.countDown();
+ }
+ }
+
+ public boolean waitForConnection() throws InterruptedException {
+ return mReceiveLatch.await(10, TimeUnit.SECONDS);
+ }
+ }
}