diff options
| author | Etan Cohen <etancohen@google.com> | 2016-11-15 17:25:38 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-11-15 17:25:38 +0000 |
| commit | b98623f8491bc0690f8f7ea723b8df78e50dc499 (patch) | |
| tree | 1b14bbdcd2a17218f18721d357043b61e7579f84 /service/jni | |
| parent | 154bcdd91306505f3c52cffaba296384f6468427 (diff) | |
| parent | 6b25452574623a2b7d12e47b588b15aec2321e79 (diff) | |
| download | android_frameworks_opt_net_wifi-b98623f8491bc0690f8f7ea723b8df78e50dc499.tar.gz android_frameworks_opt_net_wifi-b98623f8491bc0690f8f7ea723b8df78e50dc499.tar.bz2 android_frameworks_opt_net_wifi-b98623f8491bc0690f8f7ea723b8df78e50dc499.zip | |
Merge "[AWARE] Update framework code for simplified HAL error codes"
am: 6b25452574
Change-Id: I13049886fc3137986df87241a8c7b2b342a5f602
Diffstat (limited to 'service/jni')
| -rw-r--r-- | service/jni/com_android_server_wifi_aware_WifiAwareNative.cpp | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/service/jni/com_android_server_wifi_aware_WifiAwareNative.cpp b/service/jni/com_android_server_wifi_aware_WifiAwareNative.cpp index f1d292b41..fc9a08da4 100644 --- a/service/jni/com_android_server_wifi_aware_WifiAwareNative.cpp +++ b/service/jni/com_android_server_wifi_aware_WifiAwareNative.cpp @@ -46,21 +46,22 @@ extern wifi_hal_fn hal_fn; static void OnNanNotifyResponse(transaction_id id, NanResponseMsg* msg) { ALOGD( - "OnNanNotifyResponse: transaction_id=%d, status=%d, value=%d, response_type=%d", - id, msg->status, msg->value, msg->response_type); + "OnNanNotifyResponse: transaction_id=%d, status=%d, nan_error=%s, response_type=%d", + id, msg->status, msg->nan_error, msg->response_type); JNIHelper helper(mVM); + JNIObject<jstring> nan_error = helper.newStringUTF(msg->nan_error); switch (msg->response_type) { case NAN_RESPONSE_PUBLISH: helper.reportEvent(mCls, "onAwareNotifyResponsePublishSubscribe", - "(SIIII)V", (short) id, (int) msg->response_type, - (int) msg->status, (int) msg->value, + "(SIILjava/lang/String;I)V", (short) id, (int) msg->response_type, + (int) msg->status, nan_error.get(), msg->body.publish_response.publish_id); break; case NAN_RESPONSE_SUBSCRIBE: helper.reportEvent(mCls, "onAwareNotifyResponsePublishSubscribe", - "(SIIII)V", (short) id, (int) msg->response_type, - (int) msg->status, (int) msg->value, + "(SIILjava/lang/String;I)V", (short) id, (int) msg->response_type, + (int) msg->status, nan_error.get(), msg->body.subscribe_response.subscribe_id); break; case NAN_GET_CAPABILITIES: { @@ -104,19 +105,19 @@ static void OnNanNotifyResponse(transaction_id id, NanResponseMsg* msg) { helper.reportEvent( mCls, "onAwareNotifyResponseCapabilities", - "(SIILcom/android/server/wifi/aware/WifiAwareNative$Capabilities;)V", - (short) id, (int) msg->status, (int) msg->value, data.get()); + "(SILjava/lang/String;Lcom/android/server/wifi/aware/WifiAwareNative$Capabilities;)V", + (short) id, (int) msg->status, nan_error.get(), data.get()); break; } case NAN_DP_INITIATOR_RESPONSE: - helper.reportEvent(mCls, "onAwareNotifyResponseDataPathInitiate", "(SIII)V", (short) id, - (int) msg->status, (int) msg->value, + helper.reportEvent(mCls, "onAwareNotifyResponseDataPathInitiate", "(SILjava/lang/String;I)V", + (short) id, (int) msg->status, nan_error.get(), msg->body.data_request_response.ndp_instance_id); break; default: - helper.reportEvent(mCls, "onAwareNotifyResponse", "(SIII)V", (short) id, + helper.reportEvent(mCls, "onAwareNotifyResponse", "(SIILjava/lang/String;)V", (short) id, (int) msg->response_type, (int) msg->status, - (int) msg->value); + nan_error.get()); break; } } |