commit 49e295750690ab11c178c368fbfcd24686962b3d
author Tom Taylor <tomtaylor@google.com> Fri Feb 22 09:45:54 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Fri Feb 22 09:45:54 2013 -0800
tree 0f87a38cb85733f2ed1a5db64b1e65ab10a13cca
parent 8d4bb29c80e424afe597b130c2e701feccb79a68
parent 21cf95e716daac40f4da452f46f235b6b414dc12

am 21cf95e7: Don\'t allow clients to update or insert _data column data

* commit '21cf95e716daac40f4da452f46f235b6b414dc12':
  Don't allow clients to update or insert _data column data

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) {