Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a626f8d6 authored by Tsu Chiang Chuang's avatar Tsu Chiang Chuang Committed by Android Git Automerger
Browse files

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

* commit '2d559b53':
  fix NPE in race condition.
parents 8035db11 2d559b53

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

+7 −0
Original line number Diff line number Diff line
@@ -44,6 +44,8 @@ import com.android.bandwidthtest.NetworkState; 
import com.android.bandwidthtest.NetworkState.StateTransitionDirection;

import com.android.internal.util.AsyncChannel;



import junit.framework.Assert;



import java.io.IOException;

import java.net.UnknownHostException;

import java.util.List;
@@ -453,6 +455,11 @@ public class ConnectionUtil { 
                } catch (InterruptedException e) {

                    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) ||

                        (mNetworkInfo.getState() != expectedState)) {

                    Log.v(LOG_TAG, "network state for " + mNetworkInfo.getType() +