commit 9a0798ed430dd1b50cf0eba88a7342bae6edd4ad
author Jeff Tinker <jtinker@google.com> Thu Sep 05 17:54:14 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Sep 05 17:54:14 2013 -0700
tree a69ee3f543f8cd423c59c6cbc13841db55855b84
parent 7fca5ae390ab4cc0b509426c48f1a4728e3d3217
parent 3a034924636fba05dd03974cf58eaa8171628b58

am 3a034924: Fix build re: cts test for removal of installDrmEngine

* commit '3a034924636fba05dd03974cf58eaa8171628b58':
  Fix build re: cts test for removal of installDrmEngine

tests/tests/drm/lib/TestPlugin.cpp

diff --git a/tests/tests/drm/lib/TestPlugin.cpp b/tests/tests/drm/lib/TestPlugin.cpp
index d32ff96..5708909 100644
--- a/tests/tests/drm/lib/TestPlugin.cpp
+++ b/tests/tests/drm/lib/TestPlugin.cpp
@@ -96,7 +96,7 @@
     return false;
 }
 
-String8 TestPlugIn::onGetOriginalMimeType(int uniqueId, const String8& path) {
+String8 TestPlugIn::onGetOriginalMimeType(int uniqueId, const String8& path, int fd) {
     return String8("video/none");
 }
 

tests/tests/drm/lib/TestPlugin.h

diff --git a/tests/tests/drm/lib/TestPlugin.h b/tests/tests/drm/lib/TestPlugin.h
index 3499aa0..40d4ec7 100644
--- a/tests/tests/drm/lib/TestPlugin.h
+++ b/tests/tests/drm/lib/TestPlugin.h
@@ -47,7 +47,7 @@
 
     DrmInfo* onAcquireDrmInfo(int uniqueId, const DrmInfoRequest* drmInfoRequest);
 
-    String8 onGetOriginalMimeType(int uniqueId, const String8& path);
+    String8 onGetOriginalMimeType(int uniqueId, const String8& path, int fd);
 
     int onGetDrmObjectType(int uniqueId, const String8& path, const String8& mimeType);