Merge "Revert "libgui: Add getConsumerName"" into mnc-dev

9 files changed, 6 insertions, 83 deletions

diff --git a/include/gui/BufferQueueProducer.h b/include/gui/BufferQueueProducer.h
index 9754a89eac..afa7eb1801 100644
--- a/include/gui/BufferQueueProducer.h
+++ b/include/gui/BufferQueueProducer.h
@@ -178,9 +178,6 @@ public:
     // See IGraphicBufferProducer::setGenerationNumber
     virtual status_t setGenerationNumber(uint32_t generationNumber);
 
-    // See IGraphicBufferProducer::getConsumerName
-    virtual String8 getConsumerName() const override;
-
 private:
     // This is required by the IBinder::DeathRecipient interface
     virtual void binderDied(const wp<IBinder>& who);
diff --git a/include/gui/IGraphicBufferProducer.h b/include/gui/IGraphicBufferProducer.h
index 9530de1aa8..4ca4cd50de 100644
--- a/include/gui/IGraphicBufferProducer.h
+++ b/include/gui/IGraphicBufferProducer.h
@@ -480,9 +480,6 @@ public:
     // affected and will retain their current generation number. The generation
     // number defaults to 0.
     virtual status_t setGenerationNumber(uint32_t generationNumber) = 0;
-
-    // Returns the name of the connected consumer.
-    virtual String8 getConsumerName() const = 0;
 };
 
 // ----------------------------------------------------------------------------
diff --git a/include/gui/Surface.h b/include/gui/Surface.h
index 72f1067076..261b07c8f4 100644
--- a/include/gui/Surface.h
+++ b/include/gui/Surface.h
@@ -106,9 +106,6 @@ public:
      * See IGBP::setGenerationNumber for more information. */
     status_t setGenerationNumber(uint32_t generationNumber);
 
-    // See IGraphicBufferProducer::getConsumerName
-    String8 getConsumerName() const;
-
 protected:
     virtual ~Surface();
 
diff --git a/libs/gui/BufferQueueProducer.cpp b/libs/gui/BufferQueueProducer.cpp
index 38fb757665..73d4261d5f 100644
--- a/libs/gui/BufferQueueProducer.cpp
+++ b/libs/gui/BufferQueueProducer.cpp
@@ -1089,12 +1089,6 @@ status_t BufferQueueProducer::setGenerationNumber(uint32_t generationNumber) {
     return NO_ERROR;
 }
 
-String8 BufferQueueProducer::getConsumerName() const {
-    ATRACE_CALL();
-    BQ_LOGV("getConsumerName: %s", mConsumerName.string());
-    return mConsumerName;
-}
-
 void BufferQueueProducer::binderDied(const wp<android::IBinder>& /* who */) {
     // If we're here, it means that a producer we were connected to died.
     // We're guaranteed that we are still connected to it because we remove
diff --git a/libs/gui/IGraphicBufferProducer.cpp b/libs/gui/IGraphicBufferProducer.cpp
index d7a78850dd..cfe726bc0b 100644
--- a/libs/gui/IGraphicBufferProducer.cpp
+++ b/libs/gui/IGraphicBufferProducer.cpp
@@ -48,7 +48,6 @@ enum {
     ALLOCATE_BUFFERS,
     ALLOW_ALLOCATION,
     SET_GENERATION_NUMBER,
-    GET_CONSUMER_NAME,
 };
 
 class BpGraphicBufferProducer : public BpInterface<IGraphicBufferProducer>
@@ -297,17 +296,6 @@ public:
         }
         return result;
     }
-
-    virtual String8 getConsumerName() const {
-        Parcel data, reply;
-        data.writeInterfaceToken(IGraphicBufferProducer::getInterfaceDescriptor());
-        status_t result = remote()->transact(GET_CONSUMER_NAME, data, &reply);
-        if (result != NO_ERROR) {
-            ALOGE("getConsumerName failed to transact: %d", result);
-            return String8("TransactFailed");
-        }
-        return reply.readString8();
-    }
 };
 
 // Out-of-line virtual method definition to trigger vtable emission in this
@@ -479,11 +467,6 @@ status_t BnGraphicBufferProducer::onTransact(
             reply->writeInt32(result);
             return NO_ERROR;
         }
-        case GET_CONSUMER_NAME: {
-            CHECK_INTERFACE(IGraphicBufferProducer, data, reply);
-            reply->writeString8(getConsumerName());
-            return NO_ERROR;
-        }
     }
     return BBinder::onTransact(code, data, reply, flags);
 }
diff --git a/libs/gui/Surface.cpp b/libs/gui/Surface.cpp
index df0661cf4e..aeb56e0024 100644
--- a/libs/gui/Surface.cpp
+++ b/libs/gui/Surface.cpp
@@ -111,10 +111,6 @@ status_t Surface::setGenerationNumber(uint32_t generation) {
     return result;
 }
 
-String8 Surface::getConsumerName() const {
-    return mGraphicBufferProducer->getConsumerName();
-}
-
 int Surface::hook_setSwapInterval(ANativeWindow* window, int interval) {
     Surface* c = getSelf(window);
     return c->setSwapInterval(interval);
diff --git a/libs/gui/tests/BufferQueue_test.cpp b/libs/gui/tests/BufferQueue_test.cpp
index 1a54875446..3d1139d4f1 100644
--- a/libs/gui/tests/BufferQueue_test.cpp
+++ b/libs/gui/tests/BufferQueue_test.cpp
@@ -17,8 +17,6 @@
 #define LOG_TAG "BufferQueue_test"
 //#define LOG_NDEBUG 0
 
-#include "DummyConsumer.h"
-
 #include <gui/BufferItem.h>
 #include <gui/BufferQueue.h>
 #include <gui/IProducerListener.h>
@@ -69,6 +67,12 @@ protected:
     sp<IGraphicBufferConsumer> mConsumer;
 };
 
+struct DummyConsumer : public BnConsumerListener {
+    virtual void onFrameAvailable(const BufferItem& /* item */) {}
+    virtual void onBuffersReleased() {}
+    virtual void onSidebandStreamChanged() {}
+};
+
 static const uint32_t TEST_DATA = 0x12345678u;
 
 // XXX: Tests that fork a process to hold the BufferQueue must run before tests
diff --git a/libs/gui/tests/DummyConsumer.h b/libs/gui/tests/DummyConsumer.h
deleted file mode 100644
index 0511e165c2..0000000000
--- a/libs/gui/tests/DummyConsumer.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <gui/IConsumerListener.h>
-
-namespace android {
-
-struct DummyConsumer : public BnConsumerListener {
-    virtual void onFrameAvailable(const BufferItem& /* item */) {}
-    virtual void onBuffersReleased() {}
-    virtual void onSidebandStreamChanged() {}
-};
-
-} // namespace android
diff --git a/libs/gui/tests/Surface_test.cpp b/libs/gui/tests/Surface_test.cpp
index 3f495f8dee..cf0043dc62 100644
--- a/libs/gui/tests/Surface_test.cpp
+++ b/libs/gui/tests/Surface_test.cpp
@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-#include "DummyConsumer.h"
-
 #include <gtest/gtest.h>
 
 #include <binder/IMemory.h>
@@ -212,20 +210,4 @@ TEST_F(SurfaceTest, SettingGenerationNumber) {
     ASSERT_EQ(1U, graphicBuffer->getGenerationNumber());
 }
 
-TEST_F(SurfaceTest, GetConsumerName) {
-    sp<IGraphicBufferProducer> producer;
-    sp<IGraphicBufferConsumer> consumer;
-    BufferQueue::createBufferQueue(&producer, &consumer);
-
-    sp<DummyConsumer> dummyConsumer(new DummyConsumer);
-    consumer->consumerConnect(dummyConsumer, false);
-    consumer->setConsumerName(String8("TestConsumer"));
-
-    sp<Surface> surface = new Surface(producer);
-    sp<ANativeWindow> window(surface);
-    native_window_api_connect(window.get(), NATIVE_WINDOW_API_CPU);
-
-    EXPECT_STREQ("TestConsumer", surface->getConsumerName().string());
-}
-
 }