commit 0d55bb0756201bcbc16f208a98303f36cf2e00bd
author Steven Moreland <smoreland@google.com> Tue May 21 16:42:04 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue May 21 16:42:04 2019 +0000
tree bd3240c3024ab2959ab9fc1a40f3346b8e8afb20
parent ee18cdc67ba1d47e1ab6b9850f11cbaa0a798291
parent d3575e0b918855b8818620cb54c743b2eacb38e7

Merge "listByInterface -> listManifestByInterface"

services/core/jni/BroadcastRadio/BroadcastRadioService.cpp

diff --git a/services/core/jni/BroadcastRadio/BroadcastRadioService.cpp b/services/core/jni/BroadcastRadio/BroadcastRadioService.cpp
index f7ca363..be3e878 100644
--- a/services/core/jni/BroadcastRadio/BroadcastRadioService.cpp
+++ b/services/core/jni/BroadcastRadio/BroadcastRadioService.cpp
@@ -24,7 +24,7 @@
 
 #include <android/hardware/broadcastradio/1.1/IBroadcastRadio.h>
 #include <android/hardware/broadcastradio/1.1/IBroadcastRadioFactory.h>
-#include <android/hidl/manager/1.0/IServiceManager.h>
+#include <android/hidl/manager/1.2/IServiceManager.h>
 #include <broadcastradio-utils-1x/Utils.h>
 #include <core_jni_helpers.h>
 #include <hidl/ServiceManagement.h>
@@ -123,13 +123,13 @@
     auto& ctx = getNativeContext(nativeContext);
 
     // Get list of registered HIDL HAL implementations.
-    auto manager = hardware::defaultServiceManager();
+    auto manager = hardware::defaultServiceManager1_2();
     hidl_vec<hidl_string> services;
     if (manager == nullptr) {
         ALOGE("Can't reach service manager, using default service implementation only");
         services = std::vector<hidl_string>({ "default" });
     } else {
-        manager->listByInterface(V1_0::IBroadcastRadioFactory::descriptor,
+        manager->listManifestByInterface(V1_0::IBroadcastRadioFactory::descriptor,
                 [&services](const hidl_vec<hidl_string> &registered) {
             services = registered;
         });