summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@android.com>2010-09-09 13:03:11 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-09-09 13:03:11 -0700
commit3e2d81cb73a81c4429d9a8ea5271724e842838fc (patch)
treea20ec7da168d930dadfd9a4013f8e0e8d76e75db
parent980b38d2f54953c3a18de85db38d6101cf2d3582 (diff)
parent792ec849e5bc27c090c62f578846b888fa43e0d6 (diff)
downloadframeworks_base-3e2d81cb73a81c4429d9a8ea5271724e842838fc.zip
frameworks_base-3e2d81cb73a81c4429d9a8ea5271724e842838fc.tar.gz
frameworks_base-3e2d81cb73a81c4429d9a8ea5271724e842838fc.tar.bz2
Merge "MTP: Fix support for transfering folders and playlists."
-rw-r--r--media/java/android/media/MtpDatabase.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/media/java/android/media/MtpDatabase.java b/media/java/android/media/MtpDatabase.java
index 3487b0f..536d49f 100644
--- a/media/java/android/media/MtpDatabase.java
+++ b/media/java/android/media/MtpDatabase.java
@@ -246,6 +246,8 @@ public class MtpDatabase {
return new int[] {
// allow transfering arbitrary files
MtpConstants.FORMAT_UNDEFINED,
+ MtpConstants.FORMAT_ASSOCIATION,
+ MtpConstants.FORMAT_ABSTRACT_AV_PLAYLIST,
};
}