summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXia Wang <xiaw@google.com>2012-03-08 16:01:00 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-03-08 16:01:00 -0800
commit21b4d6b7a5959b567355aae032bd76500c148e54 (patch)
tree5b69a3fd9bade803877ab6a8b3d1164502b2b8b9
parent67b3a9ea61dc627b6c3997632f12d8e13e66f2c8 (diff)
parent27284da88c4552c5be4c8eff8acd36b518da47da (diff)
downloadframeworks_base-21b4d6b7a5959b567355aae032bd76500c148e54.zip
frameworks_base-21b4d6b7a5959b567355aae032bd76500c148e54.tar.gz
frameworks_base-21b4d6b7a5959b567355aae032bd76500c148e54.tar.bz2
Merge "Fix CM test http://b/issue?id=6125619"
-rw-r--r--core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/ConnectivityManagerTestActivity.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/ConnectivityManagerTestActivity.java b/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/ConnectivityManagerTestActivity.java
index 259f15f..19aa77b 100644
--- a/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/ConnectivityManagerTestActivity.java
+++ b/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/ConnectivityManagerTestActivity.java
@@ -241,6 +241,7 @@ public class ConnectivityManagerTestActivity extends Activity {
mCM = (ConnectivityManager)getSystemService(Context.CONNECTIVITY_SERVICE);
// Get an instance of WifiManager
mWifiManager =(WifiManager)getSystemService(Context.WIFI_SERVICE);
+ mContext = this;
mChannel = mWifiManager.initialize(mContext, mContext.getMainLooper(), null);
initializeNetworkStates();