summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--drm/common/DrmInfoEvent.cpp92
-rw-r--r--drm/common/IDrmServiceListener.cpp32
-rw-r--r--include/drm/DrmInfoEvent.h117
3 files changed, 4 insertions, 237 deletions
diff --git a/drm/common/DrmInfoEvent.cpp b/drm/common/DrmInfoEvent.cpp
index 2315aa9..27a5a2d 100644
--- a/drm/common/DrmInfoEvent.cpp
+++ b/drm/common/DrmInfoEvent.cpp
@@ -16,29 +16,16 @@
#include <utils/String8.h>
#include <drm/DrmInfoEvent.h>
-#include <stdlib.h>
using namespace android;
DrmInfoEvent::DrmInfoEvent(int uniqueId, int infoType, const String8 message)
: mUniqueId(uniqueId),
mInfoType(infoType),
- mMessage(message),
- mDrmBuffer() {
+ mMessage(message) {
}
-DrmInfoEvent::DrmInfoEvent(int uniqueId, int infoType, const String8 message,
- const DrmBuffer& drmBuffer)
- : mUniqueId(uniqueId), mInfoType(infoType), mMessage(message), mDrmBuffer() {
- setData(drmBuffer);
-}
-
-DrmInfoEvent::~DrmInfoEvent() {
- delete [] mDrmBuffer.data;
-}
-
-
int DrmInfoEvent::getUniqueId() const {
return mUniqueId;
}
@@ -51,80 +38,3 @@ const String8 DrmInfoEvent::getMessage() const {
return mMessage;
}
-int DrmInfoEvent::getCount() const {
- return mAttributes.size();
-}
-
-status_t DrmInfoEvent::put(const String8& key, String8& value) {
- mAttributes.add(key, value);
- return DRM_NO_ERROR;
-}
-
-const String8 DrmInfoEvent::get(const String8& key) const {
- if (mAttributes.indexOfKey(key) != NAME_NOT_FOUND) {
- return mAttributes.valueFor(key);
- }
- return String8("");
-}
-
-const DrmBuffer& DrmInfoEvent::getData() const {
- return mDrmBuffer;
-}
-
-void DrmInfoEvent::setData(const DrmBuffer& drmBuffer) {
- delete [] mDrmBuffer.data;
- mDrmBuffer.data = new char[drmBuffer.length];;
- mDrmBuffer.length = drmBuffer.length;
- memcpy(mDrmBuffer.data, drmBuffer.data, drmBuffer.length);
-}
-
-DrmInfoEvent::KeyIterator DrmInfoEvent::keyIterator() const {
- return KeyIterator(this);
-}
-
-DrmInfoEvent::Iterator DrmInfoEvent::iterator() const {
- return Iterator(this);
-}
-
-// KeyIterator implementation
-DrmInfoEvent::KeyIterator::KeyIterator(const DrmInfoEvent::KeyIterator& keyIterator)
- : mDrmInfoEvent(keyIterator.mDrmInfoEvent), mIndex(keyIterator.mIndex) {
-}
-
-bool DrmInfoEvent::KeyIterator::hasNext() {
- return (mIndex < mDrmInfoEvent->mAttributes.size());
-}
-
-const String8& DrmInfoEvent::KeyIterator::next() {
- const String8& key = mDrmInfoEvent->mAttributes.keyAt(mIndex);
- mIndex++;
- return key;
-}
-
-DrmInfoEvent::KeyIterator& DrmInfoEvent::KeyIterator::operator=(
- const DrmInfoEvent::KeyIterator& keyIterator) {
- mDrmInfoEvent = keyIterator.mDrmInfoEvent;
- mIndex = keyIterator.mIndex;
- return *this;
-}
-
-// Iterator implementation
-DrmInfoEvent::Iterator::Iterator(const DrmInfoEvent::Iterator& iterator)
- : mDrmInfoEvent(iterator.mDrmInfoEvent), mIndex(iterator.mIndex) {
-}
-
-DrmInfoEvent::Iterator& DrmInfoEvent::Iterator::operator=(const DrmInfoEvent::Iterator& iterator) {
- mDrmInfoEvent = iterator.mDrmInfoEvent;
- mIndex = iterator.mIndex;
- return *this;
-}
-
-bool DrmInfoEvent::Iterator::hasNext() {
- return mIndex < mDrmInfoEvent->mAttributes.size();
-}
-
-const String8& DrmInfoEvent::Iterator::next() {
- const String8& value = mDrmInfoEvent->mAttributes.editValueAt(mIndex);
- mIndex++;
- return value;
-}
diff --git a/drm/common/IDrmServiceListener.cpp b/drm/common/IDrmServiceListener.cpp
index d825afb..6eeea40 100644
--- a/drm/common/IDrmServiceListener.cpp
+++ b/drm/common/IDrmServiceListener.cpp
@@ -32,19 +32,6 @@ status_t BpDrmServiceListener::notify(const DrmInfoEvent& event) {
data.writeInt32(event.getType());
data.writeString8(event.getMessage());
- data.writeInt32(event.getCount());
- DrmInfoEvent::KeyIterator keyIt = event.keyIterator();
- while (keyIt.hasNext()) {
- String8 key = keyIt.next();
- data.writeString8(key);
- data.writeString8(event.get(key));
- }
- const DrmBuffer& value = event.getData();
- data.writeInt32(value.length);
- if (value.length > 0) {
- data.write(value.data, value.length);
- }
-
remote()->transact(NOTIFY, data, &reply);
return reply.readInt32();
}
@@ -62,24 +49,7 @@ status_t BnDrmServiceListener::onTransact(
int type = data.readInt32();
const String8& message = data.readString8();
- DrmInfoEvent event(uniqueId, type, message);
- int size = data.readInt32();
- for (int index = 0; index < size; index++) {
- String8 key(data.readString8());
- String8 value(data.readString8());
- event.put(key, value);
- }
- int valueSize = data.readInt32();
- if (valueSize > 0) {
- char* valueData = new char[valueSize];
- data.read(valueData, valueSize);
- DrmBuffer drmBuffer(valueData, valueSize);
- event.setData(drmBuffer);
- delete[] valueData;
- }
-
- status_t status = notify(event);
-
+ status_t status = notify(DrmInfoEvent(uniqueId, type, message));
reply->writeInt32(status);
return DRM_NO_ERROR;
diff --git a/include/drm/DrmInfoEvent.h b/include/drm/DrmInfoEvent.h
index 23b2950..dfca228 100644
--- a/include/drm/DrmInfoEvent.h
+++ b/include/drm/DrmInfoEvent.h
@@ -17,8 +17,6 @@
#ifndef __DRM_INFO_EVENT_H__
#define __DRM_INFO_EVENT_H__
-#include "drm_framework_common.h"
-
namespace android {
class String8;
@@ -73,70 +71,18 @@ public:
public:
/**
- * Constructor for DrmInfoEvent.
- * Data in drmBuffer are copied to newly allocated buffer.
+ * Constructor for DrmInfoEvent
*
* @param[in] uniqueId Unique session identifier
* @param[in] infoType Type of information
* @param[in] message Message description
- * @param[in] drmBuffer Binary information
*/
DrmInfoEvent(int uniqueId, int infoType, const String8 message);
- DrmInfoEvent(int uniqueId, int infoType, const String8 message, const DrmBuffer& drmBuffer);
/**
* Destructor for DrmInfoEvent
*/
- ~DrmInfoEvent();
-
-public:
- /**
- * Iterator for key
- */
- class KeyIterator {
- friend class DrmInfoEvent;
-
- private:
- KeyIterator(const DrmInfoEvent* drmInfoEvent)
- : mDrmInfoEvent(const_cast <DrmInfoEvent*> (drmInfoEvent)), mIndex(0) {}
-
- public:
- KeyIterator(const KeyIterator& keyIterator);
- KeyIterator& operator=(const KeyIterator& keyIterator);
- virtual ~KeyIterator() {}
-
- public:
- bool hasNext();
- const String8& next();
-
- private:
- DrmInfoEvent* mDrmInfoEvent;
- unsigned int mIndex;
- };
-
- /**
- * Iterator
- */
- class Iterator {
- friend class DrmInfoEvent;
-
- private:
- Iterator(const DrmInfoEvent* drmInfoEvent)
- : mDrmInfoEvent(const_cast <DrmInfoEvent*> (drmInfoEvent)), mIndex(0) {}
-
- public:
- Iterator(const Iterator& iterator);
- Iterator& operator=(const Iterator& iterator);
- virtual ~Iterator() {}
-
- public:
- bool hasNext();
- const String8& next();
-
- private:
- DrmInfoEvent* mDrmInfoEvent;
- unsigned int mIndex;
- };
+ virtual ~DrmInfoEvent() {}
public:
/**
@@ -160,69 +106,10 @@ public:
*/
const String8 getMessage() const;
- /**
- * Returns the number of attributes contained in this instance
- *
- * @return Number of attributes
- */
- int getCount() const;
-
- /**
- * Adds optional information as <key, value> pair to this instance
- *
- * @param[in] key Key to add
- * @param[in] value Value to add
- * @return Returns the error code
- */
- status_t put(const String8& key, String8& value);
-
- /**
- * Retrieves the value of given key
- *
- * @param key Key whose value to be retrieved
- * @return The value
- */
- const String8 get(const String8& key) const;
-
- /**
- * Returns KeyIterator object to walk through the keys associated with this instance
- *
- * @return KeyIterator object
- */
- KeyIterator keyIterator() const;
-
- /**
- * Returns Iterator object to walk through the values associated with this instance
- *
- * @return Iterator object
- */
- Iterator iterator() const;
-
- /**
- * Returns the Binary information associated with this instance
- *
- * @return Binary information
- */
- const DrmBuffer& getData() const;
-
- /**
- * Sets the Binary information associated with this instance.
- * Data in drmBuffer are copied to newly allocated buffer.
- *
- * @param[in] drmBuffer Binary information associated with this instance
- */
- void setData(const DrmBuffer& drmBuffer);
-
-private:
- DrmInfoEvent(const DrmInfoEvent& ref);
- const DrmInfoEvent& operator=(const DrmInfoEvent& ref);
-
private:
int mUniqueId;
int mInfoType;
const String8 mMessage;
- KeyedVector<String8, String8> mAttributes;
- DrmBuffer mDrmBuffer;
};
};
generated by cgit v1.1 at 2024-05-05 18:39:54 +0000