commit dd4ce1877814d6fb005e89021272feb3ccfb81d0
author Hassan Shojania <shojania@google.com> Thu Apr 20 15:25:39 2017 -0700
committer Hassan Shojania <shojania@google.com> Wed Apr 26 21:58:23 2017 +0000
tree c881295cd82baf8c3d1f2d7045f833c8ab3cb1ae
parent 5551797eb2d813ef01e23eb93fd680bc1e0dd886

Modular DRM for MediaPlayer/Removing mimes report

Bug: 34559906
Test: GTS Tests
Change-Id: I6877b9ac4ffd36f0ed476c3b4bbb0770da5abaf6

media/libmediaplayerservice/nuplayer/GenericSource.cpp

diff --git a/media/libmediaplayerservice/nuplayer/GenericSource.cpp b/media/libmediaplayerservice/nuplayer/GenericSource.cpp
index aedca3f..def078e 100644
--- a/media/libmediaplayerservice/nuplayer/GenericSource.cpp
+++ b/media/libmediaplayerservice/nuplayer/GenericSource.cpp
@@ -1952,12 +1952,12 @@
     size_t psshsize;
 
     if (!mFileMeta->findData(kKeyPssh, &type, &pssh, &psshsize)) {
-        ALOGE("checkDrmInfo: No PSSH");
+        ALOGV("checkDrmInfo: No PSSH");
         return OK; // source without DRM info
     }
 
     Parcel parcel;
-    NuPlayerDrm::retrieveDrmInfo(pssh, psshsize, mMimes, &parcel);
+    NuPlayerDrm::retrieveDrmInfo(pssh, psshsize, &parcel);
     ALOGV("checkDrmInfo: MEDIA_DRM_INFO PSSH size: %d  Parcel size: %d  objects#: %d",
           (int)psshsize, (int)parcel.dataSize(), (int)parcel.objectsCount());