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

Commit 0b58c198 authored by Mike Lockwood's avatar Mike Lockwood
Browse files

MTP: Set correct format for abstract audio playlists 



Fixes a bad interaction with the media scanner that could result in
playlists getting duplicated or deleted after rebooting.

BUG: 3175649

Change-Id: I970234e86b24ac17d069aca085683d988abc7881
Signed-off-by: default avatarMike Lockwood <lockwood@android.com>
parent 1bf397ff

media/java/android/media/MtpDatabase.java

+1 −0
Original line number Diff line number Diff line
@@ -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);

media/mtp/MtpServer.cpp

+2 −0
Original line number Diff line number Diff line
@@ -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);