summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-07-12 23:22:03 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-07-12 23:22:03 +0000
commit736a4b2aa8025a0baba1c29fe548be65df75e2d0 (patch)
tree1e137a2f177b1a0ac5633ac7caaa5d14a3159e25
parent3b2f08e502584e1d7cd96cb40c931bb3aa72cada (diff)
parent6d6e18a95daadfbc7194c99165712f97a2545fb0 (diff)
downloadIwlan-736a4b2aa8025a0baba1c29fe548be65df75e2d0.tar.gz
Snap for 10486787 from 6d6e18a95daadfbc7194c99165712f97a2545fb0 to udc-qpr1-release
Change-Id: I9f8c4553681f4481650804d3f266b7c875363041
-rw-r--r--src/com/google/android/iwlan/IwlanDataService.java2
-rw-r--r--src/com/google/android/iwlan/proto/MetricsAtom.java9
2 files changed, 11 insertions, 0 deletions
diff --git a/src/com/google/android/iwlan/IwlanDataService.java b/src/com/google/android/iwlan/IwlanDataService.java
index 9c1b549..b09b788 100644
--- a/src/com/google/android/iwlan/IwlanDataService.java
+++ b/src/com/google/android/iwlan/IwlanDataService.java
@@ -1670,6 +1670,7 @@ public class IwlanDataService extends DataService {
openedMetricsData.getIkeTunnelEstablishmentDuration());
metricsAtom.sendMetricsData();
+ metricsAtom.setMessageId(metricsAtom.INVALID_MESSAGE_ID);
break;
case EVENT_TUNNEL_CLOSED_METRICS:
@@ -1695,6 +1696,7 @@ public class IwlanDataService extends DataService {
closedMetricsData.getIkeTunnelEstablishmentDuration());
metricsAtom.sendMetricsData();
+ metricsAtom.setMessageId(metricsAtom.INVALID_MESSAGE_ID);
iwlanDataServiceProvider.mMetricsAtomForApn.remove(apnName);
break;
diff --git a/src/com/google/android/iwlan/proto/MetricsAtom.java b/src/com/google/android/iwlan/proto/MetricsAtom.java
index 7ecf464..239b4fc 100644
--- a/src/com/google/android/iwlan/proto/MetricsAtom.java
+++ b/src/com/google/android/iwlan/proto/MetricsAtom.java
@@ -18,11 +18,15 @@ package com.google.android.iwlan.proto;
import android.net.ipsec.ike.exceptions.IkeIOException;
import android.net.ipsec.ike.exceptions.IkeInternalException;
+import android.util.Log;
import com.google.android.iwlan.IwlanError;
import com.google.android.iwlan.IwlanStatsLog;
public class MetricsAtom {
+ public static int INVALID_MESSAGE_ID = -1;
+ private static final String TAG = "IwlanMetrics";
+
private int mMessageId;
private int mApnType;
private boolean mIsHandover;
@@ -148,6 +152,7 @@ public class MetricsAtom {
public void sendMetricsData() {
if (mMessageId == IwlanStatsLog.IWLAN_SETUP_DATA_CALL_RESULT_REPORTED) {
+ Log.d(TAG, "Send metrics data IWLAN_SETUP_DATA_CALL_RESULT_REPORTED");
IwlanStatsLog.write(
mMessageId,
mApnType,
@@ -170,6 +175,7 @@ public class MetricsAtom {
mIwlanErrorWrappedStackFirstFrame);
return;
} else if (mMessageId == IwlanStatsLog.IWLAN_PDN_DISCONNECTED_REASON_REPORTED) {
+ Log.d(TAG, "Send metrics data IWLAN_PDN_DISCONNECTED_REASON_REPORTED");
IwlanStatsLog.write(
mMessageId,
mDataCallFailCause,
@@ -177,6 +183,9 @@ public class MetricsAtom {
mTransportType,
mWifiSignalValue);
return;
+ } else {
+ Log.d("IwlanMetrics", "Invalid Message ID: " + mMessageId);
+ return;
}
}
}