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

Merge "BpBase -> BpHwBase" am: d8384b5c15

Browse Source 
am: e0707f139d

Change-Id: Iae97457100807d318f383eeaea4901f7ca10737e
This commit is contained in:
Yifan Hong
2017-01-12 02:08:36 +00:00
committed by android-build-merger
parent b32dfa4ef5 e0707f139d
commit 860ef8810d
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/jni/android_os_HwBinder.cpp
View File

@@ -26,7 +26,7 @@
#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/BpBase.h> #include <android/hidl/base/1.0/BpHwBase.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>
@@ -262,7 +262,7 @@ static void JHwBinder_native_registerService(
sp<hardware::IBinder> binder = JHwBinder::GetNativeContext(env, thiz); sp<hardware::IBinder> binder = JHwBinder::GetNativeContext(env, thiz);
/* TODO(b/33440494) this is not right */ /* TODO(b/33440494) this is not right */
sp<hidl::base::V1_0::IBase> base = new hidl::base::V1_0::BpBase(binder); sp<hidl::base::V1_0::IBase> base = new hidl::base::V1_0::BpHwBase(binder);
auto manager = hardware::defaultServiceManager(); auto manager = hardware::defaultServiceManager();
@@ -331,7 +331,7 @@ static jobject JHwBinder_native_getService(
} }
sp<hardware::IBinder> service = hardware::toBinder< sp<hardware::IBinder> service = hardware::toBinder<
hidl::base::V1_0::IBase, hidl::base::V1_0::BpBase>(ret); hidl::base::V1_0::IBase, hidl::base::V1_0::BpHwBase>(ret);
env->ReleaseStringUTFChars(ifaceNameObj, ifaceName); env->ReleaseStringUTFChars(ifaceNameObj, ifaceName);
ifaceName = NULL; ifaceName = NULL;