Merge "Fix CTS case testGetDeviceId of TelephonyManagerTest"
diff --git a/tests/tests/telephony/src/android/telephony/cts/TelephonyManagerTest.java b/tests/tests/telephony/src/android/telephony/cts/TelephonyManagerTest.java
index 8b76021..3223573 100644
--- a/tests/tests/telephony/src/android/telephony/cts/TelephonyManagerTest.java
+++ b/tests/tests/telephony/src/android/telephony/cts/TelephonyManagerTest.java
@@ -18,6 +18,7 @@
import android.content.Context;
import android.content.pm.PackageManager;
+import android.net.ConnectivityManager;
import android.net.wifi.WifiInfo;
import android.net.wifi.WifiManager;
import android.os.Build;
@@ -39,12 +40,14 @@
private static final int TOLERANCE = 1000;
private Looper mLooper;
private PhoneStateListener mListener;
+ private static ConnectivityManager mCm;
@Override
protected void setUp() throws Exception {
super.setUp();
mTelephonyManager =
(TelephonyManager)getContext().getSystemService(Context.TELEPHONY_SERVICE);
+ mCm = (ConnectivityManager) getContext().getSystemService(Context.CONNECTIVITY_SERVICE);
}
@Override
@@ -175,8 +178,14 @@
break;
case TelephonyManager.PHONE_TYPE_NONE:
- assertSerialNumber();
- assertMacAddressReported();
+ boolean nwSupported = mCm.isNetworkSupported(mCm.TYPE_WIFI);
+ if (nwSupported) {
+ assertSerialNumber();
+ assertMacAddressReported();
+ } else {
+ nwSupported = mCm.isNetworkSupported(mCm.TYPE_ETHERNET);
+ assertTrue(nwSupported);
+ }
break;
default: