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();
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_);
 
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.