commit 82428a862f325238cfb5646bbd65de3f1a11e7cc
author Gloria Wang <gwang@google.com> Mon Jun 27 11:09:00 2011 -0700
committer Gloria Wang <gwang@google.com> Fri Jul 01 16:52:28 2011 -0700
tree 409603a51c7b948ccbdda01548f6d35afe767b91
parent d0c18aabac682709e47b9b4a2fdd19cbb6820b7c

- Retrieve is_drm in MediaMetadataRetriever.
- Add one more column in MediaStore to indicate whether a
  media file is drm-protected.
- Remove old DRM code from Ringtone
- Use the new DRM code in RingtoneManager

Change-Id: I1311fd1c04841c2cd47df6c901589966cf55a692

media/libstagefright/StagefrightMetadataRetriever.cpp

diff --git a/media/libstagefright/StagefrightMetadataRetriever.cpp b/media/libstagefright/StagefrightMetadataRetriever.cpp
index de3957b..778c0b5 100644
--- a/media/libstagefright/StagefrightMetadataRetriever.cpp
+++ b/media/libstagefright/StagefrightMetadataRetriever.cpp
@@ -530,6 +530,11 @@
             }
         }
     }
+
+    // To check whether the media file is drm-protected
+    if (mExtractor->getDrmFlag()) {
+        mMetaData.add(METADATA_KEY_IS_DRM, String8("1"));
+    }
 }
 
 }  // namespace android