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

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

am f13d4501: Send "compilation" tag when inserting into the database. It\'s...

am f13d4501: Send "compilation" tag when inserting into the database. It\'s not actually inserted into the database, but the media provider uses it for disambiguating albums. b/3311831

* commit 'f13d4501':
  Send "compilation" tag when inserting into the database. It's not actually inserted into the database, but the media provider uses it for disambiguating albums. b/3311831
parents aab969ec f13d4501
Loading
Loading
Loading
Loading
+5 −0
Original line number Original line Diff line number Diff line
@@ -402,6 +402,7 @@ public class MediaScanner
        private long mLastModified;
        private long mLastModified;
        private long mFileSize;
        private long mFileSize;
        private String mWriter;
        private String mWriter;
        private int mCompilation;


        public FileCacheEntry beginFile(String path, String mimeType, long lastModified, long fileSize) {
        public FileCacheEntry beginFile(String path, String mimeType, long lastModified, long fileSize) {


@@ -486,6 +487,7 @@ public class MediaScanner
            mPath = path;
            mPath = path;
            mLastModified = lastModified;
            mLastModified = lastModified;
            mWriter = null;
            mWriter = null;
            mCompilation = 0;


            return entry;
            return entry;
        }
        }
@@ -596,6 +598,8 @@ public class MediaScanner
                mDuration = parseSubstring(value, 0, 0);
                mDuration = parseSubstring(value, 0, 0);
            } else if (name.equalsIgnoreCase("writer") || name.startsWith("writer;")) {
            } else if (name.equalsIgnoreCase("writer") || name.startsWith("writer;")) {
                mWriter = value.trim();
                mWriter = value.trim();
            } else if (name.equalsIgnoreCase("compilation")) {
                mCompilation = parseSubstring(value, 0, 0);
            }
            }
        }
        }


@@ -646,6 +650,7 @@ public class MediaScanner
                }
                }
                map.put(Audio.Media.TRACK, mTrack);
                map.put(Audio.Media.TRACK, mTrack);
                map.put(Audio.Media.DURATION, mDuration);
                map.put(Audio.Media.DURATION, mDuration);
                map.put(Audio.Media.COMPILATION, mCompilation);
            }
            }
            return map;
            return map;
        }
        }