Merge "Comment reason for simulateDataStall structure." am: 7039e1cbc8 am: 6342a7d978 am: 55cc17ac7d am: aa15955b02 am: 7d024f22c3

Change-Id: I5eb8b9e52e99a2a42cd7d7038442209b89de48ad

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

@@ -8192,6 +8192,11 @@ public class ConnectivityService extends IConnectivityManager.Stub
                 + "creators");
         }
 
+        // Instead of passing the data stall directly to the ConnectivityDiagnostics handler, treat
+        // this as a Data Stall received directly from NetworkMonitor. This requires wrapping the
+        // Data Stall information as a DataStallReportParcelable and passing to
+        // #notifyDataStallSuspected. This ensures that unknown Data Stall detection methods are
+        // still passed to ConnectivityDiagnostics (with new detection methods masked).
         final DataStallReportParcelable p = new DataStallReportParcelable();
         p.timestampMillis = timestampMillis;
         p.detectionMethod = detectionMethod;