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

am 131ce67d: Merge "DO NOT MERGE" into gingerbread

Browse Source 
Merge commit '131ce67d276416e3cb23a5e31121fdff1a8bf290' into gingerbread-plus-aosp

* commit '131ce67d276416e3cb23a5e31121fdff1a8bf290':
  DO NOT MERGE
This commit is contained in:
Xia Wang
2010-07-30 13:46:24 -07:00
committed by Android Git Automerger
parent 2a5db6d4b3 131ce67d27
commit 903d445f41
1 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/functional/ConnectivityManagerMobileTest.java
View File

@@ -91,30 +91,30 @@ public class ConnectivityManagerMobileTest
// DISCONNECTING, DISCONNECTED, UNKNOWN
private void waitForNetworkState(int networkType, State expectedState, long timeout) {
long startTime = System.currentTimeMillis();
// In case the broadcast is already sent out, no need to wait
if (cmActivity.mCM.getNetworkInfo(networkType).getState() == expectedState) {
return;
} else {
while (true) {
if ((System.currentTimeMillis() - startTime) > timeout) {
while (true) {
if ((System.currentTimeMillis() - startTime) > timeout) {
if (cmActivity.mCM.getNetworkInfo(networkType).getState() != expectedState) {
assertFalse("Wait for network state timeout", true);
} else {
// the broadcast has been sent out. the state has been changed.
return;
}
Log.v(LOG_TAG, "Wait for the connectivity state for network: " + networkType +
" to be " + expectedState.toString());
synchronized (cmActivity.connectivityObject) {
try {
cmActivity.connectivityObject.wait(STATE_TRANSITION_SHORT_TIMEOUT);
} catch (InterruptedException e) {
e.printStackTrace();
}
if ((cmActivity.mNetworkInfo.getType() != networkType) ||
(cmActivity.mNetworkInfo.getState() != expectedState)) {
Log.v(LOG_TAG, "network state for " + cmActivity.mNetworkInfo.getType() +
"is: " + cmActivity.mNetworkInfo.getState());
continue;
}
break;
}
Log.v(LOG_TAG, "Wait for the connectivity state for network: " + networkType +
" to be " + expectedState.toString());
synchronized (cmActivity.connectivityObject) {
try {
cmActivity.connectivityObject.wait(STATE_TRANSITION_SHORT_TIMEOUT);
} catch (InterruptedException e) {
e.printStackTrace();
}
if ((cmActivity.mNetworkInfo.getType() != networkType) ||
(cmActivity.mNetworkInfo.getState() != expectedState)) {
Log.v(LOG_TAG, "network state for " + cmActivity.mNetworkInfo.getType() +
"is: " + cmActivity.mNetworkInfo.getState());
continue;
}
break;
}
}
}
@@ -123,26 +123,26 @@ public class ConnectivityManagerMobileTest
// WIFI_STATE_ENALBING, WIFI_STATE_UNKNOWN
private void waitForWifiState(int expectedState, long timeout) {
long startTime = System.currentTimeMillis();
if (cmActivity.mWifiState == expectedState) {
return;
} else {
while (true) {
if ((System.currentTimeMillis() - startTime) > timeout) {
while (true) {
if ((System.currentTimeMillis() - startTime) > timeout) {
if (cmActivity.mWifiState != expectedState) {
assertFalse("Wait for Wifi state timeout", true);
} else {
return;
}
Log.v(LOG_TAG, "Wait for wifi state to be: " + expectedState);
synchronized (cmActivity.wifiObject) {
try {
cmActivity.wifiObject.wait(5*1000);
} catch (InterruptedException e) {
e.printStackTrace();
}
if (cmActivity.mWifiState != expectedState) {
Log.v(LOG_TAG, "Wifi state is: " + cmActivity.mWifiNetworkInfo.getState());
continue;
}
break;
}
Log.v(LOG_TAG, "Wait for wifi state to be: " + expectedState);
synchronized (cmActivity.wifiObject) {
try {
cmActivity.wifiObject.wait(5*1000);
} catch (InterruptedException e) {
e.printStackTrace();
}
if (cmActivity.mWifiState != expectedState) {
Log.v(LOG_TAG, "Wifi state is: " + cmActivity.mWifiNetworkInfo.getState());
continue;
}
break;
}
}
}