Merge "Revert "Notify the OMX component that it's going to be used in "secure" mode.""

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

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);

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);