commit 6708e008ef29b5221960d3b42ca8fcc192108192
author Wink Saville <wink@google.com> Sat Apr 16 14:45:28 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Sat Apr 16 14:45:28 2011 -0700
tree e7c1cf3213a2c32a233b12a90887ddd3ed99e209
parent dff90b7d161bd7d11d931a43aad79d87e7f4dfc1
parent 585b7acb16183ae31e71912dc2bfceea421be157

am 585b7acb: Merge "handle missing constants when creating a Phone instance" into honeycomb-LTE

* commit '585b7acb16183ae31e71912dc2bfceea421be157':
  handle missing constants when creating a Phone instance

telephony/java/com/android/internal/telephony/PhoneFactory.java

diff --git a/telephony/java/com/android/internal/telephony/PhoneFactory.java b/telephony/java/com/android/internal/telephony/PhoneFactory.java
index 27d6017..a04623f 100644
--- a/telephony/java/com/android/internal/telephony/PhoneFactory.java
+++ b/telephony/java/com/android/internal/telephony/PhoneFactory.java
@@ -178,7 +178,10 @@
         case RILConstants.NETWORK_MODE_GSM_UMTS:
             return Phone.PHONE_TYPE_GSM;
 
+        // Use CDMA Phone for the global mode including CDMA
         case RILConstants.NETWORK_MODE_GLOBAL:
+        case RILConstants.NETWORK_MODE_LTE_CDMA_EVDO:
+        case RILConstants.NETWORK_MODE_LTE_CMDA_EVDO_GSM_WCDMA:
             return Phone.PHONE_TYPE_CDMA;
 
         case RILConstants.NETWORK_MODE_LTE_ONLY: