commit 799044f32079eea8e057afda4d07b173db5da4d8
author Brian Carlstrom <bdc@google.com> Mon Aug 26 14:23:39 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Aug 26 14:23:39 2013 -0700
tree 646fa689fa404258f3154450e0f618f377c913d2
parent b59a2f446ba43996dac5d5ef8a2c847892003d31
parent 27c7fe542070a4c5fec4b1e16261adc4661eb9f9

am 505ce805: Merge "Change SSLCertificateSocketFactoryTest to use googlemail.com" into jb-dev

* commit '505ce805c31d697dd12bb2c033eb69b3d7ec9696':
  Change SSLCertificateSocketFactoryTest to use googlemail.com

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 99d2e43..4fa69a8 100644
--- a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
+++ b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
@@ -120,9 +120,14 @@
                     invalidateFeature));
         }
 
-        // Should return failure(-1) because MMS is not supported on WIFI.
-        assertEquals(failureCode, mCm.startUsingNetworkFeature(TYPE_WIFI, mmsFeature));
-        assertEquals(failureCode, mCm.stopUsingNetworkFeature(TYPE_WIFI, mmsFeature));
+        ni = mCm.getNetworkInfo(TYPE_WIFI);
+        if (ni != null) {
+            // Should return failure(-1) because MMS is not supported on WIFI.
+            assertEquals(failureCode, mCm.startUsingNetworkFeature(TYPE_WIFI,
+                    mmsFeature));
+            assertEquals(failureCode, mCm.stopUsingNetworkFeature(TYPE_WIFI,
+                    mmsFeature));
+        }
     }
 
     public void testRequestRouteToHost() {