diff options
author | Dan Stoza <stoza@google.com> | 2015-06-08 16:30:08 +0000 |
---|---|---|
committer | Dan Stoza <stoza@google.com> | 2015-06-08 16:30:08 +0000 |
commit | a2ca9bf0a9789e9e5e37961ebfb356347f59309e (patch) | |
tree | 1390497a56f7ddd62e09e5f0461ae8f35e947954 /libs | |
parent | 107fbe5599016b0e35145a1a00c4f238b63d61e4 (diff) | |
download | frameworks_native-a2ca9bf0a9789e9e5e37961ebfb356347f59309e.zip frameworks_native-a2ca9bf0a9789e9e5e37961ebfb356347f59309e.tar.gz frameworks_native-a2ca9bf0a9789e9e5e37961ebfb356347f59309e.tar.bz2 |
Revert "libgui: Add getConsumerName"
This reverts commit 107fbe5599016b0e35145a1a00c4f238b63d61e4.
Change-Id: I0c2b0f7c81193b05eb3dd2f5a59f83598434b744
Diffstat (limited to 'libs')
-rw-r--r-- | libs/gui/BufferQueueProducer.cpp | 6 | ||||
-rw-r--r-- | libs/gui/IGraphicBufferProducer.cpp | 17 | ||||
-rw-r--r-- | libs/gui/Surface.cpp | 4 | ||||
-rw-r--r-- | libs/gui/tests/BufferQueue_test.cpp | 8 | ||||
-rw-r--r-- | libs/gui/tests/DummyConsumer.h | 27 | ||||
-rw-r--r-- | libs/gui/tests/Surface_test.cpp | 18 |
6 files changed, 6 insertions, 74 deletions
diff --git a/libs/gui/BufferQueueProducer.cpp b/libs/gui/BufferQueueProducer.cpp index 38fb757..73d4261 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 d7a7885..cfe726b 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 df0661c..aeb56e0 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 1a54875..3d1139d 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 0511e16..0000000 --- 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 3f495f8..cf0043d 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()); -} - } |