From 422e3f749697ee264ea377bf92e6b65912ba7978 Mon Sep 17 00:00:00 2001
From: Andreas Huber <andih@google.com>
Date: Wed, 10 Aug 2011 12:45:24 -0700
Subject: [PATCH] Revert "Notify the OMX component that it's going to be used
 in "secure" mode."

This reverts commit 7616178271e95f009452a21ea45e7225997dc27a.
---
 include/media/stagefright/HardwareAPI.h | 10 ----------
 include/media/stagefright/OMXCodec.h    |  2 --
 media/libstagefright/OMXCodec.cpp       | 23 -----------------------
 3 files changed, 35 deletions(-)

diff --git a/include/media/stagefright/HardwareAPI.h b/include/media/stagefright/HardwareAPI.h
index d785c48708c95..32eed3f79c6cc 100644
--- a/include/media/stagefright/HardwareAPI.h
+++ b/include/media/stagefright/HardwareAPI.h
@@ -73,16 +73,6 @@ struct StoreMetaDataInBuffersParams {
     OMX_BOOL bStoreMetaData;
 };
 
-// A pointer to this struct is passed to OMX_SetParameter() when the extension
-// index "OMX.google.android.index.enableSecureMode"
-// is given.
-//
-struct EnableSecureModeParams {
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
-    OMX_BOOL bEnableSecureMode;
-};
-
 // A pointer to this struct is passed to OMX_SetParameter when the extension
 // index for the 'OMX.google.android.index.useAndroidNativeBuffer' extension is
 // given.  This call will only be performed if a prior call was made with the
diff --git a/include/media/stagefright/OMXCodec.h b/include/media/stagefright/OMXCodec.h
index 2a1b3d814f410..2932744f0e6b2 100644
--- a/include/media/stagefright/OMXCodec.h
+++ b/include/media/stagefright/OMXCodec.h
@@ -319,8 +319,6 @@ private:
     void initOutputFormat(const sp<MetaData> &inputFormat);
     status_t initNativeWindow();
 
-    status_t enableSecureMode();
-
     void dumpPortStatus(OMX_U32 portIndex);
 
     status_t configureCodec(const sp<MetaData> &meta);
diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp
index 5327f3bd7abd7..a4f3922ee0e62 100755
--- a/media/libstagefright/OMXCodec.cpp
+++ b/media/libstagefright/OMXCodec.cpp
@@ -720,32 +720,9 @@ status_t OMXCodec::configureCodec(const sp<MetaData> &meta) {
         }
     }
 
-    if (mFlags & kUseSecureInputBuffers) {
-        (void)enableSecureMode();
-    }
-
     return OK;
 }
 
-status_t OMXCodec::enableSecureMode() {
-    OMX_INDEXTYPE index;
-
-    status_t err =
-        mOMX->getExtensionIndex(
-                mNode, "OMX.google.android.index.enableSecureMode", &index);
-
-    if (err != OK) {
-        return err;
-    }
-
-    EnableSecureModeParams params;
-    InitOMXParams(&params);
-
-    params.bEnableSecureMode = OMX_TRUE;
-
-    return mOMX->setConfig(mNode, index, &params, sizeof(params));
-}
-
 void OMXCodec::setMinBufferSize(OMX_U32 portIndex, OMX_U32 size) {
     OMX_PARAM_PORTDEFINITIONTYPE def;
     InitOMXParams(&def);