| commit | 970beed5b4a5c3e235163e02c4634e78ebd30d9a | [log] [tgz] |
|---|---|---|
| author | Brian Muramatsu <btmura@google.com> | Fri May 20 12:20:35 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 20 12:20:35 2011 -0700 |
| tree | ed11708babe00605e5a643c5c546c43be8104af5 | |
| parent | 7535b7eb6edef8faf3848aec0af321a38bec2a3a [diff] | |
| parent | edb4a8f93fb0af0651a83667ea70893511cf4602 [diff] |
am edb4a8f9: Merge "Restore Null Device Id for PHONE_TYPE_NONE Devices." into honeycomb-mr2 * commit 'edb4a8f93fb0af0651a83667ea70893511cf4602': Restore Null Device Id for PHONE_TYPE_NONE Devices.
diff --git a/tests/tests/telephony/src/android/telephony/cts/TelephonyManagerTest.java b/tests/tests/telephony/src/android/telephony/cts/TelephonyManagerTest.java index 645eb81..6e8aa27 100644 --- a/tests/tests/telephony/src/android/telephony/cts/TelephonyManagerTest.java +++ b/tests/tests/telephony/src/android/telephony/cts/TelephonyManagerTest.java
@@ -296,6 +296,7 @@ break; case TelephonyManager.PHONE_TYPE_NONE: + assertNull(deviceId); assertSerialNumber(); assertMacAddressReported(); break;