commit d73a98c305bbecc5ec216f0a8c431cddcd0adff5
author Brian Muramatsu <btmura@google.com> Thu Jun 30 12:24:22 2011 -0700
committer Brian Muramatsu <btmura@google.com> Thu Jun 30 12:27:25 2011 -0700
tree 8204329dd3b8b4f767c0c10eae6b378cd71c7393
parent 2cc4fd5f6f7fc361f42f8a35f8ebc9c7035b0a21

Revert "Restore Null Device Id for PHONE_TYPE_NONE Devices."

This reverts commit 5da49ff25b3f1070f6fc14aed8d16f55c39cfbe3.

Bug 4964762

Couldn't get this fixed in time without causing other problems.

Change-Id: I3d62787fb34014ab37b4aa4c1dd7c5ea5ca3777e

tests/tests/telephony/src/android/telephony/cts/TelephonyManagerTest.java

diff --git a/tests/tests/telephony/src/android/telephony/cts/TelephonyManagerTest.java b/tests/tests/telephony/src/android/telephony/cts/TelephonyManagerTest.java
index 6e8aa27..645eb81 100644
--- a/tests/tests/telephony/src/android/telephony/cts/TelephonyManagerTest.java
+++ b/tests/tests/telephony/src/android/telephony/cts/TelephonyManagerTest.java
@@ -296,7 +296,6 @@
                 break;
 
             case TelephonyManager.PHONE_TYPE_NONE:
-                assertNull(deviceId);
                 assertSerialNumber();
                 assertMacAddressReported();
                 break;