commit dbe2434ed425b34adba871e41c544cd0fd59c965
author Jean-Baptiste Queru <jbq@google.com> Mon Aug 27 15:24:58 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Aug 27 15:24:58 2012 -0700
tree 15add34937b3c11aaa9b9e22bb3b2ab836868d6f
parent b224727b41dec60ab643a091c767ebdbf430a87f
parent cd45d791e9da02f68f743ff548272236e5636ab5

am cd45d791: am b537618e: am 914d9c23: am ba5c1f66: Merge "Fix CTS test failure"

* commit 'cd45d791e9da02f68f743ff548272236e5636ab5':
  Fix CTS test failure

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 0055330..8b76021 100644
--- a/tests/tests/telephony/src/android/telephony/cts/TelephonyManagerTest.java
+++ b/tests/tests/telephony/src/android/telephony/cts/TelephonyManagerTest.java
@@ -16,7 +16,6 @@
 
 package android.telephony.cts;
 
-
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.net.wifi.WifiInfo;
@@ -29,6 +28,8 @@
 import android.telephony.TelephonyManager;
 import android.test.AndroidTestCase;
 
+import com.android.internal.telephony.PhoneConstants;
+
 import java.util.regex.Pattern;
 
 public class TelephonyManagerTest extends AndroidTestCase {
@@ -165,7 +166,12 @@
                 break;
 
             case TelephonyManager.PHONE_TYPE_CDMA:
-                assertCdmaDeviceId(deviceId);
+                // LTE device is using IMEI as device id
+                if (mTelephonyManager.getLteOnCdmaMode() == PhoneConstants.LTE_ON_CDMA_TRUE) {
+                    assertGsmDeviceId(deviceId);
+                } else {
+                    assertCdmaDeviceId(deviceId);
+                }
                 break;
 
             case TelephonyManager.PHONE_TYPE_NONE: