summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorWei Jia <wjia@google.com>2015-10-08 10:02:30 -0700
committerWei Jia <wjia@google.com>2015-10-08 10:02:30 -0700
commit15e991bdf8870c2c9820c2d98e0d30dae2e05a25 (patch)
treead4f68934ac1f3dc1f20f9dedbccf89d1f6b75d7 /include
parent39f64a1e4903624bd6395aa2a1c6875a10ed489d (diff)
parent0b09da7a98d5f55674dba7b380e1b8d262f709b0 (diff)
downloadframeworks_av-15e991bdf8870c2c9820c2d98e0d30dae2e05a25.zip
frameworks_av-15e991bdf8870c2c9820c2d98e0d30dae2e05a25.tar.gz
frameworks_av-15e991bdf8870c2c9820c2d98e0d30dae2e05a25.tar.bz2
resolved conflicts for 0b09da7a to lmp-mr1-dev
Change-Id: Ib6a1aa4cee00e0449da30ae158d71403d6236487
Diffstat (limited to 'include')
-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> {