summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/NuCachedSource2.cpp
diff options
context:
space:
mode:
authorGloria Wang <gwang@google.com>2011-02-07 11:41:11 -0800
committerGloria Wang <gwang@google.com>2011-02-07 15:10:33 -0800
commitc2dc4729e3c88d733c0aa6d9a9af6101b2f09e35 (patch)
treeb4f2f134b82cd91f1875af223f6218f94a5425f5 /media/libstagefright/NuCachedSource2.cpp
parent1ee31175eca2fb5d6a95cb1aa4a9dbf66a5212cb (diff)
downloadframeworks_base-c2dc4729e3c88d733c0aa6d9a9af6101b2f09e35.zip
frameworks_base-c2dc4729e3c88d733c0aa6d9a9af6101b2f09e35.tar.gz
frameworks_base-c2dc4729e3c88d733c0aa6d9a9af6101b2f09e35.tar.bz2
- Do not use global DrmManagerClient
- Release the DrmManagerClient and DecryptHandle in DataSource Fix for bug 3429811 Change-Id: I549f72b75225751877eb0e630ce8098f8ec6316f
Diffstat (limited to 'media/libstagefright/NuCachedSource2.cpp')
-rw-r--r--media/libstagefright/NuCachedSource2.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libstagefright/NuCachedSource2.cpp b/media/libstagefright/NuCachedSource2.cpp
index 741aa1c..c7b99b9 100644
--- a/media/libstagefright/NuCachedSource2.cpp
+++ b/media/libstagefright/NuCachedSource2.cpp
@@ -477,8 +477,8 @@ void NuCachedSource2::resumeFetchingIfNecessary() {
restartPrefetcherIfNecessary_l(true /* ignore low water threshold */);
}
-DecryptHandle* NuCachedSource2::DrmInitialization(DrmManagerClient* client) {
- return mSource->DrmInitialization(client);
+DecryptHandle* NuCachedSource2::DrmInitialization() {
+ return mSource->DrmInitialization();
}
void NuCachedSource2::getDrmInfo(DecryptHandle **handle, DrmManagerClient **client) {