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

Merge "DO NOT MERGE" into gingerbread

Browse Source
This commit is contained in:
Xia Wang
2010-07-30 13:44:23 -07:00
committed by Android (Google) Code Review
parent 432c5b6c1d 8f076ec3c3
commit 131ce67d27
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 // DISCONNECTING, DISCONNECTED, UNKNOWN
private void waitForNetworkState(int networkType, State expectedState, long timeout) { private void waitForNetworkState(int networkType, State expectedState, long timeout) {
long startTime = System.currentTimeMillis(); long startTime = System.currentTimeMillis();
// In case the broadcast is already sent out, no need to wait while (true) {
if (cmActivity.mCM.getNetworkInfo(networkType).getState() == expectedState) { if ((System.currentTimeMillis() - startTime) > timeout) {
return; if (cmActivity.mCM.getNetworkInfo(networkType).getState() != expectedState) {
} else {
while (true) {
if ((System.currentTimeMillis() - startTime) > timeout) {
assertFalse("Wait for network state timeout", true); 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()); Log.v(LOG_TAG, "Wait for the connectivity state for network: " + networkType +
synchronized (cmActivity.connectivityObject) { " to be " + expectedState.toString());
try { synchronized (cmActivity.connectivityObject) {
cmActivity.connectivityObject.wait(STATE_TRANSITION_SHORT_TIMEOUT); try {
} catch (InterruptedException e) { cmActivity.connectivityObject.wait(STATE_TRANSITION_SHORT_TIMEOUT);
e.printStackTrace(); } 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;
} }
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 // WIFI_STATE_ENALBING, WIFI_STATE_UNKNOWN
private void waitForWifiState(int expectedState, long timeout) { private void waitForWifiState(int expectedState, long timeout) {
long startTime = System.currentTimeMillis(); long startTime = System.currentTimeMillis();
if (cmActivity.mWifiState == expectedState) { while (true) {
return; if ((System.currentTimeMillis() - startTime) > timeout) {
} else { if (cmActivity.mWifiState != expectedState) {
while (true) {
if ((System.currentTimeMillis() - startTime) > timeout) {
assertFalse("Wait for Wifi state timeout", true); assertFalse("Wait for Wifi state timeout", true);
} else {
return;
} }
Log.v(LOG_TAG, "Wait for wifi state to be: " + expectedState); }
synchronized (cmActivity.wifiObject) { Log.v(LOG_TAG, "Wait for wifi state to be: " + expectedState);
try { synchronized (cmActivity.wifiObject) {
cmActivity.wifiObject.wait(5*1000); try {
} catch (InterruptedException e) { cmActivity.wifiObject.wait(5*1000);
e.printStackTrace(); } catch (InterruptedException e) {
} e.printStackTrace();
if (cmActivity.mWifiState != expectedState) {
Log.v(LOG_TAG, "Wifi state is: " + cmActivity.mWifiNetworkInfo.getState());
continue;
}
break;
} }
if (cmActivity.mWifiState != expectedState) {
Log.v(LOG_TAG, "Wifi state is: " + cmActivity.mWifiNetworkInfo.getState());
continue;
}
break;
} }
} }
} }