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

Commit b064c0db authored by Steve Kondik's avatar Steve Kondik Committed by Gerrit Code Review
Browse files

Merge "Hiding media from folder with .nomedia file." into ics

parents 8f06763f 8f7e2298
Loading
Loading
Loading
Loading
+10 −0
Original line number Diff line number Diff line
@@ -475,6 +475,16 @@ public class MediaScanner
                key = path.toLowerCase();
            }
            FileCacheEntry entry = mFileCache.get(key);
            if (noMedia) {
                // In case the file is known and now is under a
                // .nomedia folder mark as not seen in order to
                // be removed from files table in the post scan.
                if (entry != null) {
                    entry.mSeenInFileSystem = false;
                }
                return null;
            }

            // add some slack to avoid a rounding error
            long delta = (entry != null) ? (lastModified - entry.mLastModified) : 0;
            boolean wasModified = delta > 1 || delta < -1;