Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't clear the _data column in the audio_meta table, since it isn't needed, and causes a sqlite constraint exception. Bug 2671792." into froyo

Browse Source
This commit is contained in:
Marco Nelissen
2010-05-11 14:36:16 -07:00
committed by Android (Google) Code Review
parent 037cd3413a 33f49c8377
commit 836b2d75ef
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
media/java/android/media/MediaScanner.java
View File

@@ -869,12 +869,15 @@ public class MediaScanner
values.put(MediaStore.Images.ImageColumns.DATA, "");
String [] pathSpec = new String[] {path + '%'};
try {
// These tables have DELETE_FILE triggers that delete the file from the
// sd card when deleting the database entry. We don't want to do this in
// this case, since it would cause those files to be removed if a .nomedia
// file was added after the fact, when in that case we only want the database
// entries to be removed.
mMediaProvider.update(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, values,
MediaStore.Images.ImageColumns.DATA + " LIKE ?", pathSpec);
mMediaProvider.update(MediaStore.Video.Media.EXTERNAL_CONTENT_URI, values,
MediaStore.Images.ImageColumns.DATA + " LIKE ?", pathSpec);
mMediaProvider.update(MediaStore.Audio.Media.EXTERNAL_CONTENT_URI, values,
MediaStore.Images.ImageColumns.DATA + " LIKE ?", pathSpec);
} catch (RemoteException e) {
throw new RuntimeException();
}