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

Commit be4f149f authored by The Android Open Source Project's avatar The Android Open Source Project Committed by Android Git Automerger
Browse files

am f29fbc58: merge from froyo-plus-aosp 

Merge commit 'f29fbc58'

* commit 'f29fbc58':
  Change in media scanner to set correct date
parents 21641648 f29fbc58

media/java/android/media/MediaScanner.java

+5 −1
Original line number Diff line number Diff line
@@ -1215,8 +1215,12 @@ public class MediaScanner 
            prescan(path);



            File file = new File(path);



            // lastModified is in milliseconds on Files.

            long lastModifiedSeconds = file.lastModified() / 1000;



            // always scan the file, so we can return the content://media Uri for existing files

            return mClient.doScanFile(path, mimeType, file.lastModified(), file.length(), true);

            return mClient.doScanFile(path, mimeType, lastModifiedSeconds, file.length(), true);

        } catch (RemoteException e) {

            Log.e(TAG, "RemoteException in MediaScanner.scanFile()", e);

            return null;