diff options
| author | Etan Cohen <etancohen@google.com> | 2017-01-04 15:27:54 -0800 |
|---|---|---|
| committer | Etan Cohen <etancohen@google.com> | 2017-01-04 16:06:30 -0800 |
| commit | 0e2304ddb2f516d999d63d3ec6b08a1972c978b3 (patch) | |
| tree | d7e2d7310117585bc7c9145f6ca24ef24b9465a2 /tests | |
| parent | 02938a0a735da7fafaaed84e31e1aa93cdf80a56 (diff) | |
[AWARE] Clean-up HAL API
Bug: 32207606
Test: integration (sl4a) tests passing - no regressions
Change-Id: Ie0962671c094b85aeefc0c20d72d8f713d5c6fee
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/wifitests/jni/wifi_aware_hal_mock.cpp | 2 | ||||
| -rw-r--r-- | tests/wifitests/src/com/android/server/wifi/aware/WifiAwareHalTest.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/wifitests/jni/wifi_aware_hal_mock.cpp b/tests/wifitests/jni/wifi_aware_hal_mock.cpp index ba8f9a996..dbd61f97a 100644 --- a/tests/wifitests/jni/wifi_aware_hal_mock.cpp +++ b/tests/wifitests/jni/wifi_aware_hal_mock.cpp @@ -406,7 +406,7 @@ wifi_error wifi_nan_data_request_initiator_mock( ALOGD("wifi_nan_data_request_initiator_mock"); HalMockJsonWriter jsonW; - jsonW.put_int("service_instance_id", msg->service_instance_id); + jsonW.put_int("requestor_instance_id", msg->requestor_instance_id); jsonW.put_int("channel_request_type", (int)msg->channel_request_type); jsonW.put_int("channel", (int)msg->channel); jsonW.put_byte_array("peer_disc_mac_addr", msg->peer_disc_mac_addr, 6); diff --git a/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareHalTest.java b/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareHalTest.java index d54229c35..f8371e658 100644 --- a/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareHalTest.java +++ b/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareHalTest.java @@ -862,7 +862,7 @@ public class WifiAwareHalTest { Bundle argsData = HalMockUtils.convertJsonToBundle(mArgs.getValue()); - collector.checkThat("service_instance_id", argsData.getInt("service_instance_id"), + collector.checkThat("requestor_instance_id", argsData.getInt("requestor_instance_id"), equalTo(pubSubId)); collector.checkThat("channel_request_type", argsData.getInt("channel_request_type"), equalTo(channelRequestType)); |