commit fa28dcf65809c5f748d3b1a5d4f37d104750b09b
author Brian Muramatsu <btmura@google.com> Thu Mar 31 15:53:16 2011 -0700
committer Brian Muramatsu <btmura@google.com> Thu Mar 31 15:53:16 2011 -0700
tree dbd8551d8abadb039e9b5b0cc4dd667da06692f5
parent 6fb75865a0b59ef23b024f1778fc155ca16ff77c
parent e704a78bf7a9a91bc2dfcfda8ee4acf8dcd80ef8

resolved conflicts for merge of e704a78b to honeycomb-mr1

Change-Id: I099148d3d9006dc3dbd78f3397ea186ef568ceeb

tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java

diff --git a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
index 2873f91..3751b3c 100644
--- a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
+++ b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
@@ -48,11 +48,13 @@
     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 {