Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bbafdc64 authored by Marco Nelissen's avatar Marco Nelissen Committed by Android Git Automerger
Browse files

am 836b2d75: Merge "Don\'t clear the _data column in the audio_meta table,... 

am 836b2d75: 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

Merge commit '836b2d75' into froyo-plus-aosp

* commit '836b2d75':
  Don't clear the _data column in the audio_meta table, since it isn't
parents b6e1ec19 836b2d75

media/java/android/media/MediaScanner.java

+5 −2
Original line number Original line Diff line number Diff line
@@ -869,12 +869,15 @@ public class MediaScanner 
            values.put(MediaStore.Images.ImageColumns.DATA, "");

            values.put(MediaStore.Images.ImageColumns.DATA, "");

            String [] pathSpec = new String[] {path + '%'};

            String [] pathSpec = new String[] {path + '%'};

            try {

            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,

                mMediaProvider.update(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, values,

                        MediaStore.Images.ImageColumns.DATA + " LIKE ?", pathSpec);

                        MediaStore.Images.ImageColumns.DATA + " LIKE ?", pathSpec);

                mMediaProvider.update(MediaStore.Video.Media.EXTERNAL_CONTENT_URI, values,

                mMediaProvider.update(MediaStore.Video.Media.EXTERNAL_CONTENT_URI, values,

                        MediaStore.Images.ImageColumns.DATA + " LIKE ?", pathSpec);

                        MediaStore.Images.ImageColumns.DATA + " LIKE ?", pathSpec);

                mMediaProvider.update(MediaStore.Audio.Media.EXTERNAL_CONTENT_URI, values,

                        MediaStore.Images.ImageColumns.DATA + " LIKE ?", pathSpec);

            } catch (RemoteException e) {

            } catch (RemoteException e) {

                throw new RuntimeException();

                throw new RuntimeException();

            }

            }