summaryrefslogtreecommitdiffstats
path: root/include/media
diff options
context:
space:
mode:
authorWei Jia <wjia@google.com>2015-10-08 20:06:51 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-10-08 20:06:51 +0000
commitf106f9e4eacc1cb10ccc851a37619ed4b37bbb1b (patch)
treead4f68934ac1f3dc1f20f9dedbccf89d1f6b75d7 /include/media
parentd4df7559c32d95707d2c04cbf8612db37d682ef6 (diff)
parent15e991bdf8870c2c9820c2d98e0d30dae2e05a25 (diff)
downloadframeworks_av-f106f9e4eacc1cb10ccc851a37619ed4b37bbb1b.zip
frameworks_av-f106f9e4eacc1cb10ccc851a37619ed4b37bbb1b.tar.gz
frameworks_av-f106f9e4eacc1cb10ccc851a37619ed4b37bbb1b.tar.bz2
am 15e991bd: resolved conflicts for 0b09da7a to lmp-mr1-dev
* commit '15e991bdf8870c2c9820c2d98e0d30dae2e05a25': DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer.
Diffstat (limited to 'include/media')
-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> {