Merge "Do not allow updates to the _data column."

1 files changed, 11 insertions, 0 deletions

diff --git a/src/com/android/providers/contacts/VoicemailContentTable.java b/src/com/android/providers/contacts/VoicemailContentTable.java
index 3f00b262..2047e12c 100644
--- a/src/com/android/providers/contacts/VoicemailContentTable.java
+++ b/src/com/android/providers/contacts/VoicemailContentTable.java
@@ -31,6 +31,7 @@ import android.net.Uri;
 import android.os.ParcelFileDescriptor;
 import android.provider.CallLog.Calls;
 import android.provider.OpenableColumns;
+import android.provider.VoicemailContract;
 import android.provider.VoicemailContract.Voicemails;
 import android.util.Log;
 
@@ -213,6 +214,7 @@ public class VoicemailContentTable implements VoicemailTable.Delegate {
             String[] selectionArgs) {
         checkForSupportedColumns(mVoicemailProjectionMap, values);
         checkUpdateSupported(uriData);
+        checkForUnsupportedColumnUpdates(values);
         final SQLiteDatabase db = mDbHelper.getWritableDatabase();
         // TODO: This implementation does not allow bulk update because it only accepts
         // URI that include message Id. I think we do want to support bulk update.
@@ -222,6 +224,15 @@ public class VoicemailContentTable implements VoicemailTable.Delegate {
                 selectionArgs);
     }
 
+    private void checkForUnsupportedColumnUpdates(ContentValues values) {
+        // Data column points to the voicemail audio file and is generated by the provider.
+        // Do not let applications update it.
+        if (values.containsKey(Voicemails._DATA)) {
+            throw new IllegalArgumentException("Updates to " + Voicemails._DATA +
+                    " column are not allowed.");
+        }
+    }
+
     private void checkUpdateSupported(UriData uriData) {
         if (!uriData.hasId()) {
             throw new UnsupportedOperationException(String.format(