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

Merge "android.os.HwBinder: fix native static method signature" am: 65944e79b2

Browse Source 
am: 21347cf052

Change-Id: I6ee75f8c697a46105a30d68a8ad79f00f543f9ac
This commit is contained in:
Yifan Hong
2017-10-25 22:39:22 +00:00
committed by android-build-merger
parent a2e4e1530e 21347cf052
commit 7f73cb73d2
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/jni/android_os_HwBinder.cpp
View File

@@ -332,7 +332,7 @@ static jobject JHwBinder_native_getService(
env->ReleaseStringUTFChars(serviceNameObj, serviceNameCStr); env->ReleaseStringUTFChars(serviceNameObj, serviceNameCStr);
// TODO(b/67981006): true /* retry */ // TODO(b/67981006): true /* retry */
sp<IBase> ret = getRawServiceInternal(ifaceName, serviceName, false /* retry */, false /* getStub */); sp<IBase> ret = getRawServiceInternal(ifaceName, serviceName, false /* retry */, false /* getStub */);
sp<hardware::IBinder> service = hardware::toBinder<hidl::base::V1_0::IBase>(ret); sp<hardware::IBinder> service = hardware::toBinder<hidl::base::V1_0::IBase>(ret);
if (service == NULL) { if (service == NULL) {
@@ -346,7 +346,8 @@ static jobject JHwBinder_native_getService(
return JHwRemoteBinder::NewObject(env, service); return JHwRemoteBinder::NewObject(env, service);
} }
void JHwBinder_native_configureRpcThreadpool(jlong maxThreads, jboolean callerWillJoin) { void JHwBinder_native_configureRpcThreadpool(JNIEnv *, jclass,
jlong maxThreads, jboolean callerWillJoin) {
CHECK(maxThreads > 0); CHECK(maxThreads > 0);
ProcessState::self()->setThreadPoolConfiguration(maxThreads, callerWillJoin /*callerJoinsPool*/); ProcessState::self()->setThreadPoolConfiguration(maxThreads, callerWillJoin /*callerJoinsPool*/);
} }
@@ -355,7 +356,7 @@ void JHwBinder_native_joinRpcThreadpool() {
IPCThreadState::self()->joinThreadPool(); IPCThreadState::self()->joinThreadPool();
} }
static void JHwBinder_report_sysprop_change(JNIEnv /**env*/, jobject /*clazz*/) static void JHwBinder_report_sysprop_change(JNIEnv * /*env*/, jclass /*clazz*/)
{ {
report_sysprop_change(); report_sysprop_change();
} }