summaryrefslogtreecommitdiffstats
path: root/include/media/IOMX.h
diff options
context:
space:
mode:
authorWei Jia <wjia@google.com>2015-10-08 20:10:39 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-10-08 20:10:39 +0000
commit91aa4a0aefa43ad53a20b3d4538a6a986c902818 (patch)
tree26f92a59a28b761d463006f652634d583058dbfc /include/media/IOMX.h
parenta6b9d752e7e266b63a2d9a694b3422198cb512a1 (diff)
parentf106f9e4eacc1cb10ccc851a37619ed4b37bbb1b (diff)
downloadframeworks_av-91aa4a0aefa43ad53a20b3d4538a6a986c902818.zip
frameworks_av-91aa4a0aefa43ad53a20b3d4538a6a986c902818.tar.gz
frameworks_av-91aa4a0aefa43ad53a20b3d4538a6a986c902818.tar.bz2
am f106f9e4: am 15e991bd: resolved conflicts for 0b09da7a to lmp-mr1-dev
* commit 'f106f9e4eacc1cb10ccc851a37619ed4b37bbb1b': DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer.
Diffstat (limited to 'include/media/IOMX.h')
-rw-r--r--include/media/IOMX.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/include/media/IOMX.h b/include/media/IOMX.h
index 627f23b..595e51f 100644
--- a/include/media/IOMX.h
+++ b/include/media/IOMX.h
@@ -207,6 +207,12 @@ public:
virtual status_t onTransact(
uint32_t code, const Parcel &data, Parcel *reply,
uint32_t flags = 0);
+
+protected:
+ // check if the codec is secure.
+ virtual bool isSecure(IOMX::node_id node) {
+ return false;
+ }
};
class BnOMXObserver : public BnInterface<IOMXObserver> {