commit d20b3190c28329914ad0c21c508cb3c9bb83ee02
author Zach Reizner <zachr@google.com> Wed Jul 08 23:45:04 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jul 08 23:45:04 2015 +0000
tree 72c1f0520003eaf20e564d57f531a161d0c3481c
parent 85c58c63ff707874d62e7b088e5ed439b8724d6f
parent 6cbe883275ec58139ea13fef69628f233822808e

Merge "drm_hwcomposer: Add glworker" into mnc-dev

drmproperty.cpp

diff --git a/drmproperty.cpp b/drmproperty.cpp
index 6dca12e..378e3a2 100644
--- a/drmproperty.cpp
+++ b/drmproperty.cpp
@@ -69,6 +69,9 @@
     type_ = DRM_PROPERTY_TYPE_ENUM;
   else if (flags_ & DRM_MODE_PROP_OBJECT)
     type_ = DRM_PROPERTY_TYPE_OBJECT;
+  else if (flags_ & DRM_MODE_PROP_BLOB)
+    type_ = DRM_PROPERTY_TYPE_BLOB;
+
 }
 
 uint32_t DrmProperty::id() const {
@@ -80,6 +83,11 @@
 }
 
 int DrmProperty::value(uint64_t *value) const {
+  if (type_ == DRM_PROPERTY_TYPE_BLOB) {
+    *value = value_;
+    return 0;
+  }
+
   if (values_.size() == 0)
     return -ENOENT;
 

drmproperty.h

diff --git a/drmproperty.h b/drmproperty.h
index a60ade3..96e8c20 100644
--- a/drmproperty.h
+++ b/drmproperty.h
@@ -28,6 +28,7 @@
   DRM_PROPERTY_TYPE_INT,
   DRM_PROPERTY_TYPE_ENUM,
   DRM_PROPERTY_TYPE_OBJECT,
+  DRM_PROPERTY_TYPE_BLOB,
   DRM_PROPERTY_TYPE_INVALID,
 };