commit 68b3d9f49e68a11af5225175dc9e60ce88819e84
author Edwin Wong <edwinwong@google.com> Fri Jan 06 19:07:54 2017 -0800
committer Edwin Wong <edwinwong@google.com> Mon Jan 30 15:26:51 2017 -0800
tree 750d8fe493c2ec45542968192ecfe52d83133a02
parent 9b088162cb9cdeb542f106a45d06a1f802e91e6e

Pass application packagename to drm plugin.

Pass application package name to createPlugin and createDrmPlugin.
The application packagename will be used as part of a unique
identifier for drm plugin.

Test: Play Movies.

Test: ANDROID_BUILD_TOP= ./android-gts/tools/gts-tradefed run gts -m
GtsMediaTestCases --test
com.google.android.media.gts.WidevineH264PlaybackTests#testL1With480P60

Verify the application's packagename is reachable in the drm plugin's
debug log.

bug: 27101531

Change-Id: I84fb09b591a7af63f6e20004e910112a4ce6ebac

services/mediadrm/MediaDrmService.cpp

diff --git a/services/mediadrm/MediaDrmService.cpp b/services/mediadrm/MediaDrmService.cpp
index c709b5e..e579dd8 100644
--- a/services/mediadrm/MediaDrmService.cpp
+++ b/services/mediadrm/MediaDrmService.cpp
@@ -24,7 +24,7 @@
 #include <binder/IServiceManager.h>
 #include <utils/Log.h>
 
-#ifdef ENABLE_TREBLE_DRM
+#ifdef ENABLE_TREBLE
 #include <media/CryptoHal.h>
 #include <media/DrmHal.h>
 #else
@@ -40,7 +40,7 @@
 }
 
 sp<ICrypto> MediaDrmService::makeCrypto() {
-#ifdef ENABLE_TREBLE_DRM
+#ifdef ENABLE_TREBLE
     return new CryptoHal;
 #else
     return new Crypto;
@@ -48,7 +48,7 @@
 }
 
 sp<IDrm> MediaDrmService::makeDrm() {
-#ifdef ENABLE_TREBLE_DRM
+#ifdef ENABLE_TREBLE
     return new DrmHal;
 #else
     return new Drm;