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

Commit d8929fa7 authored by Yu Shan Emily Lau's avatar Yu Shan Emily Lau Committed by Android (Google) Code Review
Browse files

Merge "Modified the expected metadata result as the behavior of Stagefright."

parents d2a2daaa a6f9e38b

media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java

+3 −3
Original line number Diff line number Diff line
@@ -394,7 +394,7 @@ public class MediaNames { 
           "ID3V2.3 Artist", "ID3V2.3 Lyricist", "ID3V2.3 Composer", null,

           "Blues", "ID3V2.3 Title", "1234", "295", "1", null},

      {"/sdcard/media_api/metaDataTestMedias/MP3/Corrupted_ID3V2_TRCK_2.mp3", "01", "ID3V2.3 Album", 

           "ID3V2.3 Artist", null, null, null, "255", "ID3V2.3 Title", "1234", "295", "1", null},

           "ID3V2.3 Artist", null, null, null, null, "ID3V2.3 Title", null, "295", "1", null},

      {"/sdcard/media_api/metaDataTestMedias/MP3/Corrupted_ID3V2_TYER.mp3", "01", "ID3V2.3 Album",

           "ID3V2.3 Artist", null, null, null, null, "ID3V2.3 Title", "9999", "295", "1", null},

      {"/sdcard/media_api/metaDataTestMedias/MP3/Corrupted_ID3V2_TYER_2.mp3", "01", "ID3V2.3 Album",
@@ -416,7 +416,7 @@ public class MediaNames { 
          null, null, "231180", "1", null},

      {"/sdcard/media_api/metaDataTestMedias/M4A/Jaws Of Life_ver1.m4a", "1/8", "Suspended Animation",

          "John Petrucci", null, null, "20070510T125223.000Z", 

          "13", "Jaws Of Life", "2005", "449329", "1", "m4a composer"},

          "12", "Jaws Of Life", "2005", "449329", "1", "m4a composer"},

      {"/sdcard/media_api/metaDataTestMedias/M4V/sample_iPod.m4v", null, null, 

          null, null, null, "20051220T202015.000Z", 

          null, null, null, "85500", "2", null},
@@ -425,7 +425,7 @@ public class MediaNames { 
          null, null, "2005", "231180", "1", null},

      {"/sdcard/media_api/metaDataTestMedias/MP4/kung_fu_panda_h264.mp4", "2/0", "mp4 album Kung Fu Panda",

          "mp4 artist Kung Fu Panda", null, null, "20080517T091451.000Z", 

          "41", "Kung Fu Panda", "2008", "128521", "2", "mp4 composer"},

          "40", "Kung Fu Panda", "2008", "128521", "2", "mp4 composer"},

      {"/sdcard/media_api/metaDataTestMedias/OGG/Ring_Classic_02.ogg", null, "Suspended Animation", 

          "John Petrucci", null, null, "20070510T125223.000Z", 

          null, null, "2005", "231180", "1", null},