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

Merge "HwBinder: fail gracefully for device w/o hwbinder"

Browse Source
This commit is contained in:
Treehugger Robot
2016-12-22 20:41:01 +00:00
committed by Gerrit Code Review
parent 933ea68aca 520d12c53c
commit 380697ca79
1 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
core/jni/android_os_HwBinder.cpp
View File

@@ -242,9 +242,19 @@ static void JHwBinder_native_registerService(
using android::hidl::manager::V1_0::IServiceManager;
sp<hardware::IBinder> binder = JHwBinder::GetNativeContext(env, thiz);
/* TODO(b/33440494) this is not right */
sp<hidl::base::V1_0::IBase> base = new hidl::base::V1_0::BpBase(binder);
bool ok = hardware::defaultServiceManager()->add(
auto manager = hardware::defaultServiceManager();
if (manager == nullptr) {
LOG(ERROR) << "Could not get hwservicemanager.";
signalExceptionForError(env, UNKNOWN_ERROR);
return;
}
bool ok = manager->add(
interfaceChain,
serviceName,
base);
@@ -289,8 +299,16 @@ static jobject JHwBinder_native_getService(
<< serviceName
<< "'";
auto manager = hardware::defaultServiceManager();
if (manager == nullptr) {
LOG(ERROR) << "Could not get hwservicemanager.";
signalExceptionForError(env, UNKNOWN_ERROR);
return NULL;
}
sp<hardware::IBinder> service;
hardware::defaultServiceManager()->get(
manager->get(
ifaceName,
serviceName,
[&service](sp<hidl::base::V1_0::IBase> out) {