LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

resolved conflicts for merge of e704a78b to honeycomb-mr1

Browse Source 
Change-Id: I099148d3d9006dc3dbd78f3397ea186ef568ceeb
This commit is contained in:
Brian Muramatsu
2011-03-31 15:53:16 -07:00
parent 6fb75865a0 e704a78bf7
commit fa28dcf658
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
View File

@@ -48,11 +48,13 @@ public class ConnectivityManagerTest extends AndroidTestCase {
public static final int TYPE_MOBILE = ConnectivityManager.TYPE_MOBILE;
public static final int TYPE_WIFI = ConnectivityManager.TYPE_WIFI;
private static final int HOST_ADDRESS = 0x7f000001;// represent ip 127.0.0.1
// device could have only one interface: data, wifi.
private static final int MIN_NUM_NETWORK_TYPES = 1;
private ConnectivityManager mCm;
private WifiManager mWifiManager;
private PackageManager mPackageManager;
// device could have only one interface: data, wifi.
private static final int MIN_NUM_NETWORK_TYPES = 1;
@Override
protected void setUp() throws Exception {