Revert "Update plugin to use cas@1.1 hal"

This reverts commit a6fc4d3f7a7f32695e019688fea9d176e982d778.

Reason for revert: <INSERT REASONING HERE>

Change-Id: I51fad3126ac1823954029922a44be84a3fa0ca2d

4 files changed, 3 insertions, 84 deletions

diff --git a/drm/mediacas/plugins/clearkey/ClearKeyCasPlugin.cpp b/drm/mediacas/plugins/clearkey/ClearKeyCasPlugin.cpp
index 27bd631afe..1558e8b8da 100644
--- a/drm/mediacas/plugins/clearkey/ClearKeyCasPlugin.cpp
+++ b/drm/mediacas/plugins/clearkey/ClearKeyCasPlugin.cpp
@@ -65,20 +65,7 @@ status_t ClearKeyCasFactory::createPlugin(
     *plugin = new ClearKeyCasPlugin(appData, callback);
     return OK;
 }
-
-status_t ClearKeyCasFactory::createPlugin(
-        int32_t CA_system_id,
-        void *appData,
-        CasPluginCallbackExt callback,
-        CasPlugin **plugin) {
-    if (!isSystemIdSupported(CA_system_id)) {
-        return BAD_VALUE;
-    }
-
-    *plugin = new ClearKeyCasPlugin(appData, callback);
-    return OK;
-}
-////////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////
 bool ClearKeyDescramblerFactory::isSystemIdSupported(
         int32_t CA_system_id) const {
     return CA_system_id == sClearKeySystemId;
@@ -101,12 +88,6 @@ ClearKeyCasPlugin::ClearKeyCasPlugin(
     ALOGV("CTOR");
 }
 
-ClearKeyCasPlugin::ClearKeyCasPlugin(
-        void *appData, CasPluginCallbackExt callback)
-    : mCallbackExt(callback), mAppData(appData) {
-    ALOGV("CTOR");
-}
-
 ClearKeyCasPlugin::~ClearKeyCasPlugin() {
     ALOGV("DTOR");
     ClearKeySessionLibrary::get()->destroyPlugin(this);
@@ -186,27 +167,8 @@ status_t ClearKeyCasPlugin::sendEvent(
     // Echo the received event to the callback.
     // Clear key plugin doesn't use any event, echo'ing for testing only.
     if (mCallback != NULL) {
-        mCallback((void*)mAppData, event, arg, (uint8_t*)eventData.data(),
-                    eventData.size());
-    } else if (mCallbackExt != NULL) {
-        mCallbackExt((void*)mAppData, event, arg, (uint8_t*)eventData.data(),
-                    eventData.size(), NULL);
-    }
-    return OK;
-}
-
-status_t ClearKeyCasPlugin::sendSessionEvent(
-        const CasSessionId &sessionId, int32_t event,
-        int arg, const CasData &eventData) {
-    ALOGV("sendSessionEvent: sessionId=%s, event=%d, arg=%d",
-          sessionIdToString(sessionId).string(), event, arg);
-    // Echo the received event to the callback.
-    // Clear key plugin doesn't use any event, echo'ing for testing only.
-    if (mCallbackExt != NULL) {
-        mCallbackExt((void*)mAppData, event, arg, (uint8_t*)eventData.data(),
-                    eventData.size(), &sessionId);
+        mCallback((void*)mAppData, event, arg, (uint8_t*)eventData.data(), eventData.size());
     }
-
     return OK;
 }
 
diff --git a/drm/mediacas/plugins/clearkey/ClearKeyCasPlugin.h b/drm/mediacas/plugins/clearkey/ClearKeyCasPlugin.h
index f48d5b1d13..389e1728d7 100644
--- a/drm/mediacas/plugins/clearkey/ClearKeyCasPlugin.h
+++ b/drm/mediacas/plugins/clearkey/ClearKeyCasPlugin.h
@@ -47,11 +47,6 @@ public:
             void *appData,
             CasPluginCallback callback,
             CasPlugin **plugin) override;
-    virtual status_t createPlugin(
-            int32_t CA_system_id,
-            void *appData,
-            CasPluginCallbackExt callback,
-            CasPlugin **plugin) override;
 };
 
 class ClearKeyDescramblerFactory : public DescramblerFactory {
@@ -68,7 +63,6 @@ public:
 class ClearKeyCasPlugin : public CasPlugin {
 public:
     ClearKeyCasPlugin(void *appData, CasPluginCallback callback);
-    ClearKeyCasPlugin(void *appData, CasPluginCallbackExt callback);
     virtual ~ClearKeyCasPlugin();
 
     virtual status_t setPrivateData(
@@ -91,10 +85,6 @@ public:
     virtual status_t sendEvent(
             int32_t event, int32_t arg, const CasData &eventData) override;
 
-    virtual status_t sendSessionEvent(
-            const CasSessionId &sessionId,
-            int32_t event, int32_t arg, const CasData &eventData) override;
-
     virtual status_t provision(const String8 &str) override;
 
     virtual status_t refreshEntitlements(
@@ -104,7 +94,6 @@ private:
     Mutex mKeyFetcherLock;
     std::unique_ptr<KeyFetcher> mKeyFetcher;
     CasPluginCallback mCallback;
-    CasPluginCallbackExt mCallbackExt;
     void* mAppData;
 };
 
diff --git a/drm/mediacas/plugins/mock/MockCasPlugin.cpp b/drm/mediacas/plugins/mock/MockCasPlugin.cpp
index 2964791413..8404a83935 100644
--- a/drm/mediacas/plugins/mock/MockCasPlugin.cpp
+++ b/drm/mediacas/plugins/mock/MockCasPlugin.cpp
@@ -60,19 +60,6 @@ status_t MockCasFactory::createPlugin(
     return OK;
 }
 
-status_t MockCasFactory::createPlugin(
-        int32_t CA_system_id,
-        void* /*appData*/,
-        CasPluginCallbackExt /*callback*/,
-        CasPlugin **plugin) {
-    if (!isSystemIdSupported(CA_system_id)) {
-        return BAD_VALUE;
-    }
-
-    *plugin = new MockCasPlugin();
-    return OK;
-}
-
 ///////////////////////////////////////////////////////////////////////////////
 
 bool MockDescramblerFactory::isSystemIdSupported(int32_t CA_system_id) const {
@@ -183,16 +170,6 @@ status_t MockCasPlugin::sendEvent(
     return OK;
 }
 
-status_t MockCasPlugin::sendSessionEvent(
-        const CasSessionId &sessionId, int32_t event,
-        int /*arg*/, const CasData& /*eventData*/) {
-    ALOGV("sendSessionEvent: sessionId=%s, event=%d",
-          arrayToString(sessionId).string(), event);
-    Mutex::Autolock lock(mLock);
-
-    return OK;
-}
-
 status_t MockCasPlugin::provision(const String8 &str) {
     ALOGV("provision: provisionString=%s", str.string());
     Mutex::Autolock lock(mLock);
diff --git a/drm/mediacas/plugins/mock/MockCasPlugin.h b/drm/mediacas/plugins/mock/MockCasPlugin.h
index 74b540cc82..81069906ed 100644
--- a/drm/mediacas/plugins/mock/MockCasPlugin.h
+++ b/drm/mediacas/plugins/mock/MockCasPlugin.h
@@ -42,11 +42,6 @@ public:
             void *appData,
             CasPluginCallback callback,
             CasPlugin **plugin) override;
-    virtual status_t createPlugin(
-            int32_t CA_system_id,
-            void *appData,
-            CasPluginCallbackExt callback,
-            CasPlugin **plugin) override;
 };
 
 class MockDescramblerFactory : public DescramblerFactory {
@@ -85,11 +80,7 @@ public:
     virtual status_t sendEvent(
             int32_t event, int32_t arg, const CasData &eventData) override;
 
-    virtual status_t sendSessionEvent(
-            const CasSessionId &sessionId,
-            int32_t event, int32_t arg, const CasData &eventData) override;
-
-     virtual status_t provision(const String8 &str) override;
+    virtual status_t provision(const String8 &str) override;
 
     virtual status_t refreshEntitlements(
             int32_t refreshType, const CasData &refreshData) override;