commit c72280d2f2d5c0cb91bb75fc8892fe9fc7bb88b5
author Tom Taylor <tomtaylor@google.com> Fri Feb 22 09:48:04 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Fri Feb 22 09:48:04 2013 -0800
tree baaed14fb58bda12af445c7efef7fa0f24630850
parent 7c24d433ed2175dfb9b75f3beeb4283aa21d94e6
parent 49e295750690ab11c178c368fbfcd24686962b3d

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

* commit '49e295750690ab11c178c368fbfcd24686962b3d':
  Don't allow clients to update or insert _data column data

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

diff --git a/src/com/android/providers/telephony/MmsProvider.java b/src/com/android/providers/telephony/MmsProvider.java
index bddce1d..3b17003 100644
--- a/src/com/android/providers/telephony/MmsProvider.java
+++ b/src/com/android/providers/telephony/MmsProvider.java
@@ -266,6 +266,10 @@
 
     @Override
     public Uri insert(Uri uri, ContentValues values) {
+        // Don't let anyone insert anything with the _data column
+        if (values != null && values.containsKey(Part._DATA)) {
+            return null;
+        }
         int msgBox = Mms.MESSAGE_BOX_ALL;
         boolean notify = true;
 
@@ -680,6 +684,10 @@
     @Override
     public int update(Uri uri, ContentValues values,
             String selection, String[] selectionArgs) {
+        // Don't let anyone update the _data column
+        if (values != null && values.containsKey(Part._DATA)) {
+            return 0;
+        }
         int match = sURLMatcher.match(uri);
         if (LOCAL_LOGV) {
             Log.v(TAG, "Update uri=" + uri + ", match=" + match);