From 2e3821a2d05cf84cb0f4505d60e1aa403c736282 Mon Sep 17 00:00:00 2001
From: Chris Phoenix <cphoenix@google.com>
Date: Tue, 24 Jan 2017 13:09:06 -0800
Subject: [PATCH] gatekeeper HAL uses "default" service name

The getService() and registerAsService() methods of interface objects
now have default parameters of "default" for the service name. HALs
will not have to use any service name unless they want to register
more than one service.

Test: builds

Bug: 33844934
Change-Id: I66ede7833e61d9cf255238888099aa73986b1946
---
 gatekeeper/1.0/default/service.cpp                              | 2 +-
 .../1.0/vts/functional/VtsHalGatekeeperV1_0TargetTest.cpp       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gatekeeper/1.0/default/service.cpp b/gatekeeper/1.0/default/service.cpp
index 407cf7157d..5cbdafbf93 100644
--- a/gatekeeper/1.0/default/service.cpp
+++ b/gatekeeper/1.0/default/service.cpp
@@ -24,5 +24,5 @@ using android::hardware::gatekeeper::V1_0::IGatekeeper;
 using android::hardware::defaultPassthroughServiceImplementation;
 
 int main() {
-    return defaultPassthroughServiceImplementation<IGatekeeper>("gatekeeper");
+    return defaultPassthroughServiceImplementation<IGatekeeper>();
 }
diff --git a/gatekeeper/1.0/vts/functional/VtsHalGatekeeperV1_0TargetTest.cpp b/gatekeeper/1.0/vts/functional/VtsHalGatekeeperV1_0TargetTest.cpp
index 7da229318d..bdc39561c2 100644
--- a/gatekeeper/1.0/vts/functional/VtsHalGatekeeperV1_0TargetTest.cpp
+++ b/gatekeeper/1.0/vts/functional/VtsHalGatekeeperV1_0TargetTest.cpp
@@ -187,7 +187,7 @@ class GatekeeperHidlTest : public ::testing::Test {
   GatekeeperHidlTest() : uid_(0) {}
   virtual void SetUp() override {
     GatekeeperResponse rsp;
-    gatekeeper_ = IGatekeeper::getService("gatekeeper");
+    gatekeeper_ = IGatekeeper::getService();
     ASSERT_NE(nullptr, gatekeeper_.get());
     doDeleteAllUsers(rsp);
   }