summaryrefslogtreecommitdiff
path: root/service
diff options
context:
space:
mode:
authorWei Wang <weiwa@google.com>2016-06-14 21:29:31 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-06-14 21:29:31 +0000
commit5764d181419458d0946b4ed98a061a5b1d1587d5 (patch)
treeedb4f701a3fb74ce83dc37deb3c2f7dbde472843 /service
parentcbfc6a05c171b8a441abad28afdef54f54f9c2cd (diff)
parent96e677b5e692ecd31d6d07335b3e403e65475bd5 (diff)
Merge \\\"Fix collection timestamp unit in RttResult\\\" into nyc-dev am: 6a6fddc42c am: 797fccd2bc
am: 96e677b5e6 Change-Id: I2b4ede65883f9b22592cd965540edfa1d72d9e86
Diffstat (limited to 'service')
-rw-r--r--service/jni/com_android_server_wifi_WifiNative.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/service/jni/com_android_server_wifi_WifiNative.cpp b/service/jni/com_android_server_wifi_WifiNative.cpp
index 703a1d272..71e39714a 100644
--- a/service/jni/com_android_server_wifi_WifiNative.cpp
+++ b/service/jni/com_android_server_wifi_WifiNative.cpp
@@ -1147,7 +1147,7 @@ static void onRttResults(wifi_request_id id, unsigned num_results, wifi_rtt_resu
helper.setIntField( rttResult, "status", result->status);
helper.setIntField( rttResult, "measurementType", result->type);
helper.setIntField(rttResult, "retryAfterDuration", result->retry_after_duration);
- helper.setLongField(rttResult, "ts", result->ts / 100);
+ helper.setLongField(rttResult, "ts", result->ts);
helper.setIntField( rttResult, "rssi", result->rssi);
helper.setIntField( rttResult, "rssiSpread", result->rssi_spread);
helper.setIntField( rttResult, "txRate", result->tx_rate.bitrate);