summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJeff Tinker <jtinker@google.com>2014-05-15 18:08:54 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-05-15 18:08:54 +0000
commit16a25c150c49c730d206167012a24cbd9eb3a082 (patch)
treebec56bf86390132bf52951236f0d7bd4f8085029 /include
parent47aea1f7c58f5302b16822f9e7e1763f2af04ef5 (diff)
parent3305b99ec3804c740aecd2ab6d1edd5c6137b7c6 (diff)
downloadframeworks_av-16a25c150c49c730d206167012a24cbd9eb3a082.zip
frameworks_av-16a25c150c49c730d206167012a24cbd9eb3a082.tar.gz
frameworks_av-16a25c150c49c730d206167012a24cbd9eb3a082.tar.bz2
Merge "Hook up event handling in NDK MediaDrm API"
Diffstat (limited to 'include')
-rw-r--r--include/ndk/NdkMediaDrm.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/ndk/NdkMediaDrm.h b/include/ndk/NdkMediaDrm.h
index 1322a9d..02619d3 100644
--- a/include/ndk/NdkMediaDrm.h
+++ b/include/ndk/NdkMediaDrm.h
@@ -122,7 +122,7 @@ void AMediaDrm_release(AMediaDrm *);
*
* listener is the callback that will be invoked on event
*/
-void AMediaDrm_setOnEventListener(AMediaDrm *, AMediaDrmEventListener listener);
+mediadrm_status_t AMediaDrm_setOnEventListener(AMediaDrm *, AMediaDrmEventListener listener);
/**
* Open a new session with the MediaDrm object. A session ID is returned.