diff options
| author | Mike Lockwood <lockwood@android.com> | 2010-11-17 12:50:28 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-11-17 12:50:28 -0800 |
| commit | 558cf799293df19aab99b30d5a1579b989e0465a (patch) | |
| tree | 9d9b21f79483b0d9f1e49ee6661639d808ec942d /media | |
| parent | d348bb4feff72d047a1037537be2d334a00c380c (diff) | |
| parent | 0b58c19840c577c8d8fd8aa5315676d61b78ba0f (diff) | |
| download | frameworks_base-558cf799293df19aab99b30d5a1579b989e0465a.zip frameworks_base-558cf799293df19aab99b30d5a1579b989e0465a.tar.gz frameworks_base-558cf799293df19aab99b30d5a1579b989e0465a.tar.bz2 | |
Merge "MTP: Set correct format for abstract audio playlists"
Diffstat (limited to 'media')
| -rw-r--r-- | media/java/android/media/MtpDatabase.java | 1 | ||||
| -rw-r--r-- | media/mtp/MtpServer.cpp | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/media/java/android/media/MtpDatabase.java b/media/java/android/media/MtpDatabase.java index 42d068f..ab31cd4 100644 --- a/media/java/android/media/MtpDatabase.java +++ b/media/java/android/media/MtpDatabase.java @@ -184,6 +184,7 @@ public class MtpDatabase { ContentValues values = new ContentValues(1); values.put(Audio.Playlists.DATA, path); values.put(Audio.Playlists.NAME, name); + values.put(Files.FileColumns.FORMAT, format); values.put(MediaColumns.MEDIA_SCANNER_NEW_OBJECT_ID, handle); try { Uri uri = mMediaProvider.insert(Audio.Playlists.EXTERNAL_CONTENT_URI, values); diff --git a/media/mtp/MtpServer.cpp b/media/mtp/MtpServer.cpp index 6cf70ec..7edbeb4 100644 --- a/media/mtp/MtpServer.cpp +++ b/media/mtp/MtpServer.cpp @@ -624,6 +624,7 @@ MtpResponseCode MtpServer::doSendObjectInfo() { mData.getString(modified); // date modified // keywords follow + LOGD("name: %s format: %04X\n", (const char *)name, format); time_t modifiedTime; if (!parseDateTime(modified, modifiedTime)) modifiedTime = 0; @@ -692,6 +693,7 @@ MtpResponseCode MtpServer::doSendObject() { mfr.offset = 0; mfr.length = mSendObjectFileSize; + LOGD("receiving %s\n", (const char *)mSendObjectFilePath); // transfer the file ret = ioctl(mFD, MTP_RECEIVE_FILE, (unsigned long)&mfr); close(mfr.fd); |