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

Merge "HwBinder: Remove use of IHw class."

Browse Source
This commit is contained in:
Martijn Coenen
2016-12-15 20:28:48 +00:00
committed by Gerrit Code Review
parent a1c9c860a9 1298711674
commit 11ec22ab2a
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/jni/android_os_HwBinder.cpp
View File

@@ -26,10 +26,11 @@
#include <JNIHelp.h> #include <JNIHelp.h>
#include <android/hidl/manager/1.0/IServiceManager.h> #include <android/hidl/manager/1.0/IServiceManager.h>
#include <android/hidl/base/1.0/IBase.h> #include <android/hidl/base/1.0/IBase.h>
#include <android/hidl/base/1.0/IHwBase.h> #include <android/hidl/base/1.0/BpBase.h>
#include <android_runtime/AndroidRuntime.h> #include <android_runtime/AndroidRuntime.h>
#include <hidl/ServiceManagement.h> #include <hidl/ServiceManagement.h>
#include <hidl/Status.h> #include <hidl/Status.h>
#include <hidl/HidlTransportSupport.h>
#include <hwbinder/ProcessState.h> #include <hwbinder/ProcessState.h>
#include <nativehelper/ScopedLocalRef.h> #include <nativehelper/ScopedLocalRef.h>
@@ -241,14 +242,8 @@ static void JHwBinder_native_registerService(
using android::hidl::manager::V1_0::IServiceManager; using android::hidl::manager::V1_0::IServiceManager;
sp<hardware::IBinder> binder = JHwBinder::GetNativeContext(env, thiz); sp<hardware::IBinder> binder = JHwBinder::GetNativeContext(env, thiz);
/* TODO(b/33440494) this is not right */
sp<hidl::base::V1_0::IBase> base = hidl::base::V1_0::IHwBase::asInterface(binder); sp<hidl::base::V1_0::IBase> base = new hidl::base::V1_0::BpBase(binder);
if (base.get() == nullptr) {
LOG(ERROR) << "IBinder object cannot be casted to the base interface.";
signalExceptionForError(env, UNKNOWN_ERROR);
return;
}
bool ok = hardware::defaultServiceManager()->add( bool ok = hardware::defaultServiceManager()->add(
interfaceChain, interfaceChain,
serviceName, serviceName,
@@ -300,7 +295,7 @@ static jobject JHwBinder_native_getService(
serviceName, serviceName,
[&service](sp<hidl::base::V1_0::IBase> out) { [&service](sp<hidl::base::V1_0::IBase> out) {
service = hardware::toBinder< service = hardware::toBinder<
hidl::base::V1_0::IBase, hidl::base::V1_0::IHwBase hidl::base::V1_0::IBase, hidl::base::V1_0::BpBase
>(out); >(out);
}); });