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

am 2d559b53: Merge "fix NPE in race condition." into ics-mr1

Browse Source 
* commit '2d559b5311be1cd909e5a445afe75a840688b822':
  fix NPE in race condition.
This commit is contained in:
Tsu Chiang Chuang
2012-02-17 15:55:44 -08:00
committed by Android Git Automerger
parent fef000e3fa 2d559b5311
commit 90cfe0f2f1
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/tests/bandwidthtests/src/com/android/bandwidthtest/util/ConnectionUtil.java
View File

@@ -44,6 +44,8 @@ import com.android.bandwidthtest.NetworkState;
import com.android.bandwidthtest.NetworkState.StateTransitionDirection; import com.android.bandwidthtest.NetworkState.StateTransitionDirection;
import com.android.internal.util.AsyncChannel; import com.android.internal.util.AsyncChannel;
import junit.framework.Assert;
import java.io.IOException; import java.io.IOException;
import java.net.UnknownHostException; import java.net.UnknownHostException;
import java.util.List; import java.util.List;
@@ -453,6 +455,11 @@ public class ConnectionUtil {
} catch (InterruptedException e) { } catch (InterruptedException e) {
e.printStackTrace(); e.printStackTrace();
} }
if (mNetworkInfo == null) {
Log.v(LOG_TAG, "Do not have networkInfo! Force fetch of network info.");
mNetworkInfo = mCM.getActiveNetworkInfo();
Assert.assertNotNull(mNetworkInfo);
}
if ((mNetworkInfo.getType() != networkType) || if ((mNetworkInfo.getType() != networkType) ||
(mNetworkInfo.getState() != expectedState)) { (mNetworkInfo.getState() != expectedState)) {
Log.v(LOG_TAG, "network state for " + mNetworkInfo.getType() + Log.v(LOG_TAG, "network state for " + mNetworkInfo.getType() +