Merge "Move Data Stall logic to CS from NetworkMonitorCallbacks." am: ec00ab6d7b (b1623b89) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/ConnectivityService.java

+26 −23

Original line number	Diff line number	Diff line
		@@ -3079,6 +3079,21 @@ public class ConnectivityService extends IConnectivityManager.Stub

		@Override
		public void notifyDataStallSuspected(DataStallReportParcelable p) {
		ConnectivityService.this.notifyDataStallSuspected(p, mNetId);
		}

		@Override
		public int getInterfaceVersion() {
		return this.VERSION;
		}

		@Override
		public String getInterfaceHash() {
		return this.HASH;
		}
		}

		private void notifyDataStallSuspected(DataStallReportParcelable p, int netId) {
		final PersistableBundle extras = new PersistableBundle();
		switch (p.detectionMethod) {
		case DETECTION_METHOD_DNS_EVENTS:
		@@ -3090,30 +3105,19 @@ public class ConnectivityService extends IConnectivityManager.Stub
		p.tcpMetricsCollectionPeriodMillis);
		break;
		default:
		// TODO(b/156294356): update for new data stall detection methods
		log("Unknown data stall detection method, ignoring: " + p.detectionMethod);
		return;
		}

		proxyDataStallToConnectivityDiagnosticsHandler(
		p.detectionMethod, mNetId, p.timestampMillis, extras);
		notifyDataStallSuspected(p.detectionMethod, netId, p.timestampMillis, extras);
		}

		@Override
		public int getInterfaceVersion() {
		return this.VERSION;
		}

		@Override
		public String getInterfaceHash() {
		return this.HASH;
		}
		}

		private void proxyDataStallToConnectivityDiagnosticsHandler(int detectionMethod, int netId,
		long timestampMillis, @NonNull PersistableBundle extras) {
		private void notifyDataStallSuspected(int detectionMethod, int netId, long timestampMillis,
		@NonNull PersistableBundle extras) {
		final Message msg = mConnectivityDiagnosticsHandler.obtainMessage(
		ConnectivityDiagnosticsHandler.EVENT_DATA_STALL_SUSPECTED,
		detectionMethod, netId, timestampMillis);
		ConnectivityDiagnosticsHandler.EVENT_DATA_STALL_SUSPECTED, detectionMethod, netId,
		timestampMillis);
		msg.setData(new Bundle(extras));

		// NetworkStateTrackerHandler currently doesn't take any actions based on data
		@@ -8181,7 +8185,6 @@ public class ConnectivityService extends IConnectivityManager.Stub
		+ "creators");
		}

		proxyDataStallToConnectivityDiagnosticsHandler(
		detectionMethod, network.netId, timestampMillis, extras);
		notifyDataStallSuspected(detectionMethod, network.netId, timestampMillis, extras);
		}
		}