commit 9742634af81d0445f1c1e277f2fd7bca547d0900
author Wink Saville <wink@google.com> Wed Jul 11 17:52:10 2012 -0700
committer Wink Saville <wink@google.com> Wed Jul 11 17:52:10 2012 -0700
tree 6a2ba9bca64bdaae7066a70e706760206510af7c
parent 9eab3d8fec8e031ead1c1f09ef40e0998a228d10
parent bf7c617b88876d8255590de1c855a6edeaa7dad2

Merge commit 'bf7c617b' into mit

* commit 'bf7c617b':
  Use telephony-common and mms-common

Android.mk

diff --git a/Android.mk b/Android.mk
index b0f3906..68a9e0a 100644
--- a/Android.mk
+++ b/Android.mk
@@ -8,6 +8,7 @@
 LOCAL_PACKAGE_NAME := TelephonyProvider
 LOCAL_CERTIFICATE := platform
 
+LOCAL_JAVA_LIBRARIES += telephony-common mms-common
 LOCAL_STATIC_JAVA_LIBRARIES += android-common
 
 include $(BUILD_PACKAGE)

src/com/android/providers/telephony/TelephonyProvider.java

diff --git a/src/com/android/providers/telephony/TelephonyProvider.java b/src/com/android/providers/telephony/TelephonyProvider.java
index 79d6a95..c1069a1 100755
--- a/src/com/android/providers/telephony/TelephonyProvider.java
+++ b/src/com/android/providers/telephony/TelephonyProvider.java
@@ -33,11 +33,13 @@
 import android.os.Environment;
 import android.os.FileUtils;
 import android.provider.Telephony;
+import android.telephony.TelephonyManager;
 import android.util.Log;
 import android.util.Xml;
 
 import com.android.internal.telephony.BaseCommands;
 import com.android.internal.telephony.Phone;
+import com.android.internal.telephony.PhoneConstants;
 import com.android.internal.util.XmlUtils;
 
 import org.xmlpull.v1.XmlPullParser;
@@ -393,7 +395,7 @@
     }
 
     private boolean isLteOnCdma() {
-        return BaseCommands.getLteOnCdmaModeStatic() == Phone.LTE_ON_CDMA_TRUE;
+        return TelephonyManager.getLteOnCdmaModeStatic() == PhoneConstants.LTE_ON_CDMA_TRUE;
     }
 
     private void setPreferredApnId(Long id) {