From 49821a11e15c6d16e317301b6b83faf98bb12cd6 Mon Sep 17 00:00:00 2001
From: Etan Cohen <etancohen@google.com>
Date: Wed, 16 May 2018 17:50:53 -0700
Subject: [PATCH] [RTT] Legacy RTT API: add attempted/succeeded counts

Wi-Fi RTT legacy API is (now) a wrapper around the new API. Two
new result parameters were added to the new API but not propagated
to the corresponding legacy API:

- Count of attempted measurements
- Count of successful measurements

Bug: 79883720
Test: unit tests
Test: RangeApSupporting11McTest:test_legacy_rtt_80211mc_supporting_aps
Change-Id: Id000c691c22319474e3e98f5ba5d77e4bb4c343e
---
 wifi/java/android/net/wifi/RttManager.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/wifi/java/android/net/wifi/RttManager.java b/wifi/java/android/net/wifi/RttManager.java
index 50c4b5eed508c..9ab374a5c4cb9 100644
--- a/wifi/java/android/net/wifi/RttManager.java
+++ b/wifi/java/android/net/wifi/RttManager.java
@@ -995,6 +995,10 @@ public class RttManager {
                                     result.getDistanceStdDevMm() / 10;
                             legacyResults[i].rssi = result.getRssi() * -2;
                             legacyResults[i].ts = result.getRangingTimestampMillis() * 1000;
+                            legacyResults[i].measurementFrameNumber =
+                                    result.getNumAttemptedMeasurements();
+                            legacyResults[i].successMeasurementFrameNumber =
+                                    result.getNumSuccessfulMeasurements();
                         } else {
                             // just in case legacy API needed some relatively real timestamp
                             legacyResults[i].ts = SystemClock.elapsedRealtime() * 1000;