Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "listByInterface -> listManifestByInterface" am: 0d55bb0756

Browse Source 
am: fa5a2f5b75

Change-Id: Ifce23bfdffbfee572b003878e08078ac83ae308f
This commit is contained in:
Steven Moreland
2019-05-21 13:30:43 -07:00
committed by android-build-merger
parent 9870dfb99a fa5a2f5b75
commit 0dd3908911
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/jni/BroadcastRadio/BroadcastRadioService.cpp
View File

@@ -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 @@ static jobject nativeLoadModules(JNIEnv *env, jobject obj, jlong nativeContext)
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;
});