commit abc399792d3544aeaa0679f26322555ff2240c06
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Feb 23 04:13:46 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Feb 23 04:13:47 2017 +0000
tree fe51a6792d105995217ec5f0c7b41cb1da4e157e
parent 8c4bbd5d5063f021ae2ed928934338f083eec3a0
parent f60901070768c0790639ea62953a56a7f6bc1ed2

Merge "BroadcastRadio HAL uses "default" service name"

audio/2.0/default/service.cpp

diff --git a/audio/2.0/default/service.cpp b/audio/2.0/default/service.cpp
index 5782c6e..935d556 100644
--- a/audio/2.0/default/service.cpp
+++ b/audio/2.0/default/service.cpp
@@ -45,7 +45,7 @@
     // Soundtrigger and FM radio might be not present.
     status = registerPassthroughServiceImplementation<ISoundTriggerHw>("sound_trigger.primary");
     ALOGE_IF(status != OK, "Error while registering soundtrigger service: %d", status);
-    status = registerPassthroughServiceImplementation<IBroadcastRadioFactory>("broadcastradio");
+    status = registerPassthroughServiceImplementation<IBroadcastRadioFactory>();
     ALOGE_IF(status != OK, "Error while registering fm radio service: %d", status);
     joinRpcThreadpool();
     return status;

broadcastradio/1.0/vts/functional/VtsHalBroadcastradioV1_0TargetTest.cpp

diff --git a/broadcastradio/1.0/vts/functional/VtsHalBroadcastradioV1_0TargetTest.cpp b/broadcastradio/1.0/vts/functional/VtsHalBroadcastradioV1_0TargetTest.cpp
index bcbfbb7..da17514 100644
--- a/broadcastradio/1.0/vts/functional/VtsHalBroadcastradioV1_0TargetTest.cpp
+++ b/broadcastradio/1.0/vts/functional/VtsHalBroadcastradioV1_0TargetTest.cpp
@@ -63,7 +63,7 @@
             }
         }
         sp<IBroadcastRadioFactory> factory =
-              IBroadcastRadioFactory::getService("broadcastradio", getStub);
+              IBroadcastRadioFactory::getService(getStub);
         if (factory != 0) {
             factory->connectModule(Class::AM_FM,
                              [&](Result retval, const ::android::sp<IBroadcastRadio>& result) {