Revert "Add plugin API to use cas@1.1 new interface"
This reverts commit d5dda38886699b8383f7ce38f7d254b14a18dec3.
Reason for revert: <INSERT REASONING HERE>
Change-Id: I7e4abd8e9e5e21abda3ec13e5764d9155e634ec7
diff --git a/headers/media_plugin/media/cas/CasAPI.h b/headers/media_plugin/media/cas/CasAPI.h
index c87ee56..4de314d 100644
--- a/headers/media_plugin/media/cas/CasAPI.h
+++ b/headers/media_plugin/media/cas/CasAPI.h
@@ -48,14 +48,6 @@
uint8_t *data,
size_t size);
-typedef void (*CasPluginCallbackExt)(
- void *appData,
- int32_t event,
- int32_t arg,
- uint8_t *data,
- size_t size,
- const CasSessionId *sessionId);
-
struct CasFactory {
CasFactory() {}
virtual ~CasFactory() {}
@@ -75,13 +67,6 @@
CasPluginCallback callback,
CasPlugin **plugin) = 0;
- // Construct a new extend instance of a CasPlugin given a CA_system_id
- virtual status_t createPlugin(
- int32_t CA_system_id,
- void *appData,
- CasPluginCallbackExt callback,
- CasPlugin **plugin) = 0;
-
private:
CasFactory(const CasFactory &);
CasFactory &operator=(const CasFactory &); /* NOLINT */
@@ -125,15 +110,7 @@
int32_t arg,
const CasData &eventData) = 0;
- // Deliver an session event to the CasPlugin. The format of the event is
- // specific to the CA scheme and is opaque to the framework.
- virtual status_t sendSessionEvent(
- const CasSessionId &sessionId,
- int32_t event,
- int32_t arg,
- const CasData &eventData) = 0;
-
- // Native implementation of the MediaCas Java API provision method.
+ // Native implementation of the MediaCas Java API provision method.
virtual status_t provision(
const String8 &provisionString) = 0;