commit 2bf2988f603fb40db6fb44bd19aa311a27f989b2
author Jiwen Cai <jwcai@google.com> Thu Oct 04 20:14:05 2018 +0000
committer Jiwen Cai <jwcai@google.com> Thu Oct 04 20:46:54 2018 +0000
tree ab70da82b10580f3ab3e89c42a8f5c1cae8c0508
parent 5c97aa1a4fce21b9e85dfd8091063e4bf0769aef

Revert "Implement dumpsys for BufferHubBinderService"

This reverts commit 5c97aa1a4fce21b9e85dfd8091063e4bf0769aef.

Reason for revert: Breaking PDX bufferhubd

Change-Id: I98d1e81a0663d537d325177dbe139c1e97ccb8c8

services/vr/bufferhubd/tests/Android.bp

diff --git a/services/vr/bufferhubd/tests/Android.bp b/services/vr/bufferhubd/tests/Android.bp
index 92bda78..4d1d43f 100644
--- a/services/vr/bufferhubd/tests/Android.bp
+++ b/services/vr/bufferhubd/tests/Android.bp
@@ -6,18 +6,11 @@
         "-DTRACE=0",
         "-DATRACE_TAG=ATRACE_TAG_GRAPHICS",
     ],
-    header_libs: ["libdvr_headers"],
-    static_libs: [
-        "libbufferhub",
-        "libbufferhubd",
-        "libgmock",
-    ],
+    static_libs: ["libbufferhubd"],
     shared_libs: [
         "libbase",
         "libbinder",
         "liblog",
-        "libpdx_default_transport",
-        "libui",
         "libutils",
     ],
 }
\ No newline at end of file

services/vr/bufferhubd/tests/buffer_hub_binder_service-test.cpp

diff --git a/services/vr/bufferhubd/tests/buffer_hub_binder_service-test.cpp b/services/vr/bufferhubd/tests/buffer_hub_binder_service-test.cpp
index 0b64cf0..e3f2825 100644
--- a/services/vr/bufferhubd/tests/buffer_hub_binder_service-test.cpp
+++ b/services/vr/bufferhubd/tests/buffer_hub_binder_service-test.cpp
@@ -1,8 +1,7 @@
-#include <binder/IServiceManager.h>
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
 #include <private/dvr/buffer_hub_binder.h>
 
+#include <gtest/gtest.h>
+
 namespace android {
 namespace dvr {
 
@@ -13,12 +12,8 @@
 };
 
 TEST_F(BufferHubBinderServiceTest, TestInitialize) {
-  // Create a new service will kill the current one.
-  // So just check if Binder service is running
-  sp<IServiceManager> sm = defaultServiceManager();
-  sp<IBinder> service = sm->checkService(
-      String16(BufferHubBinderService::getServiceName()));
-  EXPECT_THAT(service, ::testing::Ne(nullptr));
+  // Test if start binder server returns OK
+  EXPECT_EQ(BufferHubBinderService::start(), OK);
 }
 
 }  // namespace