Fix wrong transfer time log for incoming satellite datagram
In case datagram was received and there was pendings, trigger pollPendingStatelliteDatagramInternal and log the start transfer time for it.
Then initialize transfer start time due to the wrong invocation order for reportMetrics and pollPendingSatelliteDatagramInternal.
This cause total transfer time for incoming datagram become abnormally big.
moved reportMetrics above the pollPendingSatellite so that wrong initialization does not happen
Bug: 371054237
Flag: EXEMPT bugfix
Test: atest DatagramReceiverTest SatelliteControllerTest
ControllerMetricsTest SatelliteStatsTest PersistAtomsTest
Change-Id: Ib0f7890c82649ab427e6f11d4a500112f28a942b
diff --git a/src/java/com/android/internal/telephony/satellite/DatagramReceiver.java b/src/java/com/android/internal/telephony/satellite/DatagramReceiver.java
index a921b89..75771d0 100644
--- a/src/java/com/android/internal/telephony/satellite/DatagramReceiver.java
+++ b/src/java/com/android/internal/telephony/satellite/DatagramReceiver.java
@@ -376,6 +376,10 @@
});
}
+ // Send the captured data about incoming datagram to metric
+ sInstance.reportMetrics(satelliteDatagram,
+ SatelliteManager.SATELLITE_RESULT_SUCCESS);
+
if (pendingCount <= 0) {
sInstance.mDatagramController.updateReceiveStatus(mSubId,
SatelliteManager.DATAGRAM_TYPE_SOS_MESSAGE,
@@ -393,10 +397,6 @@
internalCallback::accept);
sInstance.pollPendingSatelliteDatagramsInternal(mSubId, callback);
}
-
- // Send the captured data about incoming datagram to metric
- sInstance.reportMetrics(satelliteDatagram,
- SatelliteManager.SATELLITE_RESULT_SUCCESS);
break;
}
@@ -748,8 +748,8 @@
(int) (Math.round((double) sizeBytes / ROUNDING_UNIT) * ROUNDING_UNIT);
}
datagramTransferTime = (System.currentTimeMillis() - mDatagramTransferStartTime);
- mDatagramTransferStartTime = 0;
}
+ mDatagramTransferStartTime = 0;
SatelliteStats.getInstance().onSatelliteIncomingDatagramMetrics(
new SatelliteStats.SatelliteIncomingDatagramParams.Builder()