diff options
author | Changyeon Jo <changyeon@google.com> | 2020-02-05 21:54:32 -0800 |
---|---|---|
committer | Changyeon Jo <changyeon@google.com> | 2020-02-05 22:00:51 -0800 |
commit | 57749856a1e7c4dc0073093a288ee000e20fa30c (patch) | |
tree | db4096ee758f908e5e42e35bf4f820b84d998a2b | |
parent | 9699ef8e2d7c2858f40353fef977272f12badf3d (diff) | |
download | interfaces-57749856a1e7c4dc0073093a288ee000e20fa30c.tar.gz |
Rename CarWindowService
This change renames CarWindowService as AutomotiveDisplayProxyService.
Bug: 148993064
Test: ./update-makefiles.sh; m -j
Change-Id: I65f7746e5304ce72cc73baff97d84a448e51711a
Signed-off-by: Changyeon Jo <changyeon@google.com>
-rw-r--r-- | automotive/display/1.0/Android.bp | 2 | ||||
-rw-r--r-- | automotive/display/1.0/IAutomotiveDisplayProxyService.hal (renamed from automotive/display/1.0/ICarWindowService.hal) | 2 | ||||
-rw-r--r-- | automotive/display/1.0/vts/functional/VtsHalAutomotiveDisplayV1_0TargetTest.cpp | 16 |
3 files changed, 10 insertions, 10 deletions
diff --git a/automotive/display/1.0/Android.bp b/automotive/display/1.0/Android.bp index 25ff06a..cedf84e 100644 --- a/automotive/display/1.0/Android.bp +++ b/automotive/display/1.0/Android.bp @@ -7,7 +7,7 @@ hidl_interface { enabled: true, }, srcs: [ - "ICarWindowService.hal", + "IAutomotiveDisplayProxyService.hal" ], interfaces: [ "android.hardware.graphics.bufferqueue@2.0", diff --git a/automotive/display/1.0/ICarWindowService.hal b/automotive/display/1.0/IAutomotiveDisplayProxyService.hal index e785e42..dde71f5 100644 --- a/automotive/display/1.0/ICarWindowService.hal +++ b/automotive/display/1.0/IAutomotiveDisplayProxyService.hal @@ -18,7 +18,7 @@ package android.frameworks.automotive.display@1.0; import android.hardware.graphics.bufferqueue@2.0::IGraphicBufferProducer; -interface ICarWindowService { +interface IAutomotiveDisplayProxyService { /** * Gets an IGraphicBufferProducer instance from the service. * diff --git a/automotive/display/1.0/vts/functional/VtsHalAutomotiveDisplayV1_0TargetTest.cpp b/automotive/display/1.0/vts/functional/VtsHalAutomotiveDisplayV1_0TargetTest.cpp index f407b16..3576bda 100644 --- a/automotive/display/1.0/vts/functional/VtsHalAutomotiveDisplayV1_0TargetTest.cpp +++ b/automotive/display/1.0/vts/functional/VtsHalAutomotiveDisplayV1_0TargetTest.cpp @@ -17,7 +17,7 @@ #define LOG_TAG "VtsHalAutomotiveDisplayTest" #include <android-base/logging.h> -#include <android/frameworks/automotive/display/1.0/ICarWindowService.h> +#include <android/frameworks/automotive/display/1.0/IAutomotiveDisplayProxyService.h> #include <android/hardware/graphics/bufferqueue/2.0/IGraphicBufferProducer.h> #include <utils/Log.h> @@ -34,39 +34,39 @@ class AutomotiveDisplayHidlTest : public ::testing::TestWithParam<std::string> { public: virtual void SetUp() override { // Make sure we can connect to the service - mCarWindowService = ICarWindowService::getService(GetParam()); - ASSERT_NE(mCarWindowService.get(), nullptr); + mDisplayProxy = IAutomotiveDisplayProxyService::getService(GetParam()); + ASSERT_NE(mDisplayProxy.get(), nullptr); } virtual void TearDown() override {} - sp<ICarWindowService> mCarWindowService; // Every test needs access to the service + sp<IAutomotiveDisplayProxyService> mDisplayProxy; // Every test needs access to the service }; TEST_P(AutomotiveDisplayHidlTest, getIGBP) { ALOGI("Test getIGraphicBufferProducer method"); - sp<IGraphicBufferProducer> igbp = mCarWindowService->getIGraphicBufferProducer(); + sp<IGraphicBufferProducer> igbp = mDisplayProxy->getIGraphicBufferProducer(); ASSERT_NE(igbp, nullptr); } TEST_P(AutomotiveDisplayHidlTest, showWindow) { ALOGI("Test showWindow method"); - ASSERT_EQ(mCarWindowService->showWindow(), true); + ASSERT_EQ(mDisplayProxy->showWindow(), true); } TEST_P(AutomotiveDisplayHidlTest, hideWindow) { ALOGI("Test hideWindow method"); - ASSERT_EQ(mCarWindowService->hideWindow(), true); + ASSERT_EQ(mDisplayProxy->hideWindow(), true); } INSTANTIATE_TEST_SUITE_P( PerInstance, AutomotiveDisplayHidlTest, testing::ValuesIn( - android::hardware::getAllHalInstanceNames(ICarWindowService::descriptor) + android::hardware::getAllHalInstanceNames(IAutomotiveDisplayProxyService::descriptor) ), android::hardware::PrintInstanceNameToString ); |