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

Merge "Check for nullptr when casting IBinder to IBase." am: 5014028691

Browse Source 
am: 1abe6def68

Change-Id: I532e548c9558dada977ca1926ef4b7e39215924f
This commit is contained in:
Yifan Hong
2016-12-06 15:45:33 +00:00
committed by android-build-merger
parent ca8412c316 1abe6def68
commit fee17700af
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/jni/android_os_HwBinder.cpp
View File

@@ -241,7 +241,14 @@ 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);
sp<hidl::base::V1_0::IBase> base = hidl::base::V1_0::IHwBase::asInterface(binder); sp<hidl::base::V1_0::IBase> base = hidl::base::V1_0::IHwBase::asInterface(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,