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

Merge "HwBinder: register with registerAsServiceInternal"

Browse Source
This commit is contained in:
Steven Moreland
2019-05-14 15:26:29 +00:00
committed by Gerrit Code Review
parent 2ac6496fb8 ded421f535
commit dc1372dd0d
1 changed files with 3 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/jni/android_os_HwBinder.cpp
View File

@@ -284,28 +284,17 @@ static void JHwBinder_native_registerService(
} }
sp<hardware::IBinder> binder = JHwBinder::GetNativeBinder(env, thiz); sp<hardware::IBinder> binder = JHwBinder::GetNativeBinder(env, thiz);
/* TODO(b/33440494) this is not right */
sp<hidl::base::V1_0::IBase> base = new hidl::base::V1_0::BpHwBase(binder); sp<hidl::base::V1_0::IBase> base = new hidl::base::V1_0::BpHwBase(binder);
auto manager = hardware::defaultServiceManager(); bool ok = hardware::details::registerAsServiceInternal(base, str.c_str()) == OK;
if (manager == nullptr) {
LOG(ERROR) << "Could not get hwservicemanager.";
signalExceptionForError(env, UNKNOWN_ERROR, true /* canThrowRemoteException */);
return;
}
Return<bool> ret = manager->add(str.c_str(), base);
bool ok = ret.isOk() && ret;
if (ok) { if (ok) {
LOG(INFO) << "HwBinder: Starting thread pool for " << str.c_str(); LOG(INFO) << "HwBinder: Starting thread pool for " << str.c_str();
::android::hardware::ProcessState::self()->startThreadPool(); ::android::hardware::ProcessState::self()->startThreadPool();
} }
signalExceptionForError(env, (ok ? OK : UNKNOWN_ERROR), true /* canThrowRemoteException */); // avoiding richer error exceptions to stick with legacy behavior
signalExceptionForError(env, (ok ? OK : UNKNOWN_ERROR), true /*canThrowRemoteException*/);
} }
static jobject JHwBinder_native_getService( static jobject JHwBinder_native_getService(