commit 49a706d548ac78d5bea896e922286cad4df026dc
author Corey Tabaka <eieio@google.com> Thu Jun 08 14:29:58 2017 -0700
committer Corey Tabaka <eieio@google.com> Wed Jun 28 20:12:14 2017 -0700
tree c12ce896acf88396713e88cbcea992d52d5630d6
parent feb636dcd9296c27390b3d729951ceca154cd7d0

DVR API: Implement support for deleting surface attributes.

- Implement support for deleting surface attributes using the "NONE"
  attribute type.
- Add tests for attribute events and attribute deletion.

Bug: 62456002
Test: dvr_api-test passes.
Change-Id: I66b6edbd35077596d89e85829bcbe7c52829ef5b

libs/vr/libdvr/dvr_surface.cpp

diff --git a/libs/vr/libdvr/dvr_surface.cpp b/libs/vr/libdvr/dvr_surface.cpp
index c44f8a6..30f25e3 100644
--- a/libs/vr/libdvr/dvr_surface.cpp
+++ b/libs/vr/libdvr/dvr_surface.cpp
@@ -2,6 +2,7 @@
 
 #include <inttypes.h>
 
+#include <pdx/rpc/variant.h>
 #include <private/android/AHardwareBufferHelpers.h>
 #include <private/dvr/display_client.h>
 
@@ -14,6 +15,7 @@
 using android::dvr::display::SurfaceAttributes;
 using android::dvr::display::SurfaceAttributeValue;
 using android::dvr::CreateDvrReadBufferFromBufferConsumer;
+using android::pdx::rpc::EmptyVariant;
 
 namespace {
 
@@ -51,6 +53,9 @@
       case DVR_SURFACE_ATTRIBUTE_TYPE_FLOAT16:
         value = attributes[i].value.float16_value;
         break;
+      case DVR_SURFACE_ATTRIBUTE_TYPE_NONE:
+        value = EmptyVariant{};
+        break;
       default:
         *error_index = i;
         return false;