commit ddb90db093b62d513a59ddc71fcc47836a7e86fa
author Fan Xu <fanxu@google.com> Wed Oct 03 10:09:14 2018 -0700
committer Fan Xu <fanxu@google.com> Mon Oct 08 10:05:26 2018 -0700
tree dadf6582997a34067c7943852a19707a1dd21c15
parent 7a0f33ea236a02be627ee090e9ef9b574bb94512

Temporarily disable detach and promote

After disccusion, we decided that our migrationg will start with
detached buffer. Therefore, until we refractor both producer buffer and
detached buffer to use binder, it makes no sense to write a converter
between pdx and binder backend.

As detached buffer is neither used outside nor exposed via API, this
change should not have any negative effect.

Some tests are also disabled since after refractoring the behavior might
change, which means we have to rewrite them after refracting. Put TODOs
above them.

Change-Id: I937403a4a8ae9f3ea94718211e12326ace9060bf
Test: 'atest buffer_hub-test': passed

libs/vr/libbufferhub/buffer_hub-test.cpp

diff --git a/libs/vr/libbufferhub/buffer_hub-test.cpp b/libs/vr/libbufferhub/buffer_hub-test.cpp
index 11b2211..57eee91 100644
--- a/libs/vr/libbufferhub/buffer_hub-test.cpp
+++ b/libs/vr/libbufferhub/buffer_hub-test.cpp
@@ -729,6 +729,9 @@
 }
 
 TEST_F(LibBufferHubTest, TestDetachBufferFromProducer) {
+  // TODO(b/112338294) rewrite test after migration
+  return;
+
   std::unique_ptr<BufferProducer> p = BufferProducer::Create(
       kWidth, kHeight, kFormat, kUsage, sizeof(uint64_t));
   std::unique_ptr<BufferConsumer> c =
@@ -834,6 +837,9 @@
 }
 
 TEST_F(LibBufferHubTest, TestPromoteDetachedBuffer) {
+  // TODO(b/112338294) rewrite test after migration
+  return;
+
   auto b1 = DetachedBuffer::Create(kWidth, kHeight, kLayerCount, kFormat,
                                    kUsage, kUserMetadataSize);
   int b1_id = b1->id();
@@ -867,6 +873,9 @@
 }
 
 TEST_F(LibBufferHubTest, TestDetachThenPromote) {
+  // TODO(b/112338294) rewrite test after migration
+  return;
+
   std::unique_ptr<BufferProducer> p1 = BufferProducer::Create(
       kWidth, kHeight, kFormat, kUsage, sizeof(uint64_t));
   ASSERT_TRUE(p1.get() != nullptr);
@@ -942,6 +951,9 @@
   EXPECT_TRUE(IsBufferGained(b1->buffer_state()));
   EXPECT_TRUE(IsBufferGained(b2->buffer_state()));
 
+  // TODO(b/112338294) rewrite test after migration
+  return;
+
   // Promote the detached buffer should fail as b1 is no longer the exclusive
   // owner of the buffer..
   status_or_handle = b1->Promote();

libs/vr/libbufferhub/detached_buffer.cpp

diff --git a/libs/vr/libbufferhub/detached_buffer.cpp b/libs/vr/libbufferhub/detached_buffer.cpp
index 7716cfa..8a8c4ce 100644
--- a/libs/vr/libbufferhub/detached_buffer.cpp
+++ b/libs/vr/libbufferhub/detached_buffer.cpp
@@ -133,6 +133,10 @@
 }
 
 Status<LocalChannelHandle> DetachedBuffer::Promote() {
+  // TODO(b/112338294) remove after migrate producer buffer to binder
+  ALOGW("DetachedBuffer::Promote: not supported operation during migration");
+  return {};
+
   ATRACE_NAME("DetachedBuffer::Promote");
   ALOGD_IF(TRACE, "DetachedBuffer::Promote: id=%d.", id_);
 

libs/vr/libbufferhub/producer_buffer.cpp

diff --git a/libs/vr/libbufferhub/producer_buffer.cpp b/libs/vr/libbufferhub/producer_buffer.cpp
index c4f1a3b..7b6f77a 100644
--- a/libs/vr/libbufferhub/producer_buffer.cpp
+++ b/libs/vr/libbufferhub/producer_buffer.cpp
@@ -222,6 +222,10 @@
 }
 
 Status<LocalChannelHandle> ProducerBuffer::Detach() {
+  // TODO(b/112338294) remove after migrate producer buffer to binder
+  ALOGW("ProducerBuffer::Detach: not supported operation during migration");
+  return {};
+
   uint64_t buffer_state = buffer_state_->load();
   if (!BufferHubDefs::IsBufferGained(buffer_state)) {
     // Can only detach a ProducerBuffer when it's in gained state.