Merge "Data activity didn't reflect UDP traffic" (a0229525) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/dataconnection/DcTracker.java

+14 −3

Original line number	Diff line number	Diff line
		@@ -353,10 +353,21 @@ public class DcTracker extends Handler {
		return "{txSum=" + txPkts + " rxSum=" + rxPkts + "}";
		}

		public void updateTxRxSum() {
		/**
		* Get Tcp Tx/Rx packet count from TrafficStats
		*/
		public void updateTcpTxRxSum() {
		this.txPkts = TrafficStats.getMobileTcpTxPackets();
		this.rxPkts = TrafficStats.getMobileTcpRxPackets();
		}

		/**
		* Get total Tx/Rx packet count from TrafficStats
		*/
		public void updateTotalTxRxSum() {
		this.txPkts = TrafficStats.getMobileTxPackets();
		this.rxPkts = TrafficStats.getMobileRxPackets();
		}
		}

		private void onActionIntentReconnectAlarm(Intent intent) {
		@@ -4399,7 +4410,7 @@ public class DcTracker extends Handler {

		TxRxSum preTxRxSum = new TxRxSum(mTxPkts, mRxPkts);
		TxRxSum curTxRxSum = new TxRxSum();
		curTxRxSum.updateTxRxSum();
		curTxRxSum.updateTotalTxRxSum();
		mTxPkts = curTxRxSum.txPkts;
		mRxPkts = curTxRxSum.rxPkts;

		@@ -4563,7 +4574,7 @@ public class DcTracker extends Handler {
		long sent, received;

		TxRxSum preTxRxSum = new TxRxSum(mDataStallTxRxSum);
		mDataStallTxRxSum.updateTxRxSum();
		mDataStallTxRxSum.updateTcpTxRxSum();

		if (VDBG_STALL) {
		log("updateDataStallInfo: mDataStallTxRxSum=" + mDataStallTxRxSum +