commit 5afff430a4ebb751dadeb0112a1fe2052c6f5c05
author Marco Nelissen <marcone@google.com> Mon Feb 06 13:05:22 2012 -0800
committer Marco Nelissen <marcone@google.com> Mon Feb 06 13:05:22 2012 -0800
tree abe681d139391748dbb9b46eb6caf3e3cff31251
parent a6207286f6e1cc4a13d44194f25ecfc40796e024

Remove _DELETE_FILE trigger for videos

Change-Id: Ie49d5ab7529ba80f1cf30aa019ee2eeec0b5f1f1

src/com/android/providers/media/MediaProvider.java

diff --git a/src/com/android/providers/media/MediaProvider.java b/src/com/android/providers/media/MediaProvider.java
index f1d4d7c..9b5035b 100644
--- a/src/com/android/providers/media/MediaProvider.java
+++ b/src/com/android/providers/media/MediaProvider.java
@@ -1620,6 +1620,10 @@
             db.execSQL("DROP TRIGGER IF EXISTS images_cleanup;");
             db.execSQL("DROP TRIGGER IF EXISTS thumbnails_cleanup;");
         }
+        if (fromVersion < 502) {
+            // we're now deleting the file in mediaprovider code, rather than via a trigger
+            db.execSQL("DROP TRIGGER IF EXISTS video_cleanup;");
+        }
         sanityCheck(db, fromVersion);
     }
 
@@ -3616,6 +3620,11 @@
                                 db.delete("thumbnails", "image_id=?", idvalue);
                             } catch (ErrnoException e) {
                             }
+                        } else if (mediatype == FileColumns.MEDIA_TYPE_VIDEO) {
+                            try {
+                                Libcore.os.remove(c.getString(1));
+                            } catch (ErrnoException e) {
+                            }
                         } else if (mediatype == FileColumns.MEDIA_TYPE_AUDIO) {
                             // TODO, maybe: remove the "audio_meta_cleanup" trigger and implement
                             // its functionality here (clean up genres map and playlist map)
@@ -4739,7 +4748,7 @@
     private static String TAG = "MediaProvider";
     private static final boolean LOCAL_LOGV = false;
 
-    static final int DATABASE_VERSION = 501;
+    static final int DATABASE_VERSION = 502;
     private static final String INTERNAL_DATABASE_NAME = "internal.db";
     private static final String EXTERNAL_DATABASE_NAME = "external.db";