commit dbd63c68e11e28ccaf688fe1090df50144f57a6e
author Mark Tabry <mtab@google.com> Tue Jun 11 15:08:06 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Jun 11 15:08:06 2019 -0700
tree d7c42610a649691575a24464c81cdae981b564c9
parent b2aba114b717a658cab471b47512c4bed3633ffe
parent f653d45ebc0c28ea79136c8fbb921c33f5cb21b0

Merge "Register VmsPublisherService with VmsClientManager on construction time." into qt-dev am: 2bf78744d3
am: f653d45ebc

Change-Id: I7872c21c140fc313b113f833907608a823ac3ad2

service/src/com/android/car/VmsPublisherService.java

diff --git a/service/src/com/android/car/VmsPublisherService.java b/service/src/com/android/car/VmsPublisherService.java
index 3384e3a..647b102 100644
--- a/service/src/com/android/car/VmsPublisherService.java
+++ b/service/src/com/android/car/VmsPublisherService.java
@@ -119,16 +119,14 @@
         mContext = context;
         mClientManager = clientManager;
         mBrokerService = brokerService;
-    }
-
-    @Override
-    public void init() {
         mClientManager.registerConnectionListener(this);
     }
 
     @Override
+    public void init() {}
+
+    @Override
     public void release() {
-        mClientManager.unregisterConnectionListener(this);
         mPublisherProxies.values().forEach(PublisherProxy::unregister);
         mPublisherProxies.clear();
     }

tests/carservice_unit_test/src/com/android/car/VmsPublisherServiceTest.java

diff --git a/tests/carservice_unit_test/src/com/android/car/VmsPublisherServiceTest.java b/tests/carservice_unit_test/src/com/android/car/VmsPublisherServiceTest.java
index 2c63ef5..d65bc12 100644
--- a/tests/carservice_unit_test/src/com/android/car/VmsPublisherServiceTest.java
+++ b/tests/carservice_unit_test/src/com/android/car/VmsPublisherServiceTest.java
@@ -108,6 +108,8 @@
     @Before
     public void setUp() {
         mPublisherService = new VmsPublisherService(mContext, mBrokerService, mClientManager);
+        verify(mClientManager).registerConnectionListener(mPublisherService);
+
         mPublisherClient = new MockPublisherClient();
         mPublisherClient2 = new MockPublisherClient();
         when(mBrokerService.getSubscribersForLayerFromPublisher(LAYER, PUBLISHER_ID))
@@ -118,7 +120,6 @@
     @Test
     public void testInit() {
         mPublisherService.init();
-        verify(mClientManager).registerConnectionListener(mPublisherService);
     }
 
     @Test
@@ -637,7 +638,6 @@
     @Test
     public void testRelease() {
         mPublisherService.release();
-        verify(mClientManager).unregisterConnectionListener(mPublisherService);
     }
 
     private class MockPublisherClient extends IVmsPublisherClient.Stub {