summaryrefslogtreecommitdiffstats
path: root/media/java/android
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2011-01-07 09:22:57 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-01-07 09:22:57 -0800
commit2888208b0bb38ac93bb6b500992869c8a6bf244c (patch)
tree337f9c350302e1dd0fb68dbc32a8c041986d2508 /media/java/android
parentaab969ec2baff1f2bcd1d002e9e06e385df5af74 (diff)
parentf13d4501396aa1679004ad07d440f65ced3ecc2b (diff)
downloadframeworks_base-2888208b0bb38ac93bb6b500992869c8a6bf244c.zip
frameworks_base-2888208b0bb38ac93bb6b500992869c8a6bf244c.tar.gz
frameworks_base-2888208b0bb38ac93bb6b500992869c8a6bf244c.tar.bz2
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 'f13d4501396aa1679004ad07d440f65ced3ecc2b': 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
Diffstat (limited to 'media/java/android')
-rw-r--r--media/java/android/media/MediaScanner.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/media/java/android/media/MediaScanner.java b/media/java/android/media/MediaScanner.java
index 3333268..ab2c6ea 100644
--- a/media/java/android/media/MediaScanner.java
+++ b/media/java/android/media/MediaScanner.java
@@ -402,6 +402,7 @@ public class MediaScanner
private long mLastModified;
private long mFileSize;
private String mWriter;
+ private int mCompilation;
public FileCacheEntry beginFile(String path, String mimeType, long lastModified, long fileSize) {
@@ -486,6 +487,7 @@ public class MediaScanner
mPath = path;
mLastModified = lastModified;
mWriter = null;
+ mCompilation = 0;
return entry;
}
@@ -596,6 +598,8 @@ public class MediaScanner
mDuration = parseSubstring(value, 0, 0);
} else if (name.equalsIgnoreCase("writer") || name.startsWith("writer;")) {
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.DURATION, mDuration);
+ map.put(Audio.Media.COMPILATION, mCompilation);
}
return map;
}