summaryrefslogtreecommitdiff
path: root/service
diff options
context:
space:
mode:
authorNate Jiang <qiangjiang@google.com>2019-07-31 17:39:24 -0700
committerNate Jiang <qiangjiang@google.com>2019-07-31 17:39:24 -0700
commit52a165fe0af0aabf909ff26b2fd0bb4f99a0fe24 (patch)
treeddc7085ff1bc582ec7b03cafea79e64d445235b3 /service
parenta6ac095190541bbaee876964323c276bdb127ca3 (diff)
[AWARE] fix Aware metrics mismatch
Fix the mismatch between proto and Nanstatustype Bug: 129772246 Test: atest android.net.wifi Test: atest com.android.server.wifi Change-Id: I585e0de41c9168331d5c3541867ab9e64387aed4
Diffstat (limited to 'service')
-rw-r--r--service/java/com/android/server/wifi/aware/WifiAwareMetrics.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/service/java/com/android/server/wifi/aware/WifiAwareMetrics.java b/service/java/com/android/server/wifi/aware/WifiAwareMetrics.java
index 2f072c06f..b47f0a309 100644
--- a/service/java/com/android/server/wifi/aware/WifiAwareMetrics.java
+++ b/service/java/com/android/server/wifi/aware/WifiAwareMetrics.java
@@ -234,7 +234,7 @@ public class WifiAwareMetrics {
*/
public void recordAttachStatus(int status) {
synchronized (mLock) {
- mAttachStatusData.put(status, mAttachStatusData.get(status) + 1);
+ addNanHalStatusToHistogram(status, mAttachStatusData);
}
}
@@ -354,9 +354,9 @@ public class WifiAwareMetrics {
public void recordDiscoveryStatus(int uid, int status, boolean isPublish) {
synchronized (mLock) {
if (isPublish) {
- mPublishStatusData.put(status, mPublishStatusData.get(status) + 1);
+ addNanHalStatusToHistogram(status, mPublishStatusData);
} else {
- mSubscribeStatusData.put(status, mSubscribeStatusData.get(status) + 1);
+ addNanHalStatusToHistogram(status, mSubscribeStatusData);
}
if (status == NanStatusType.NO_RESOURCES_AVAILABLE) {
@@ -463,9 +463,9 @@ public class WifiAwareMetrics {
public void recordNdpStatus(int status, boolean isOutOfBand, long startTimestamp) {
synchronized (mLock) {
if (isOutOfBand) {
- mOutOfBandNdpStatusData.put(status, mOutOfBandNdpStatusData.get(status) + 1);
+ addNanHalStatusToHistogram(status, mOutOfBandNdpStatusData);
} else {
- mInBandNdpStatusData.put(status, mOutOfBandNdpStatusData.get(status) + 1);
+ addNanHalStatusToHistogram(status, mInBandNdpStatusData);
}
if (status == NanStatusType.SUCCESS) {