commit 0754170b83d189e1cd3732ee7c7c79a6127ce040
author Remi NGUYEN VAN <reminv@google.com> Fri May 31 11:45:26 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri May 31 11:45:26 2024 +0000
tree 613866bc3e928546e713b6295604fedbd4ba5208
parent 2972e60d97486a442c386c6115916481c6f87961
parent 4090861c5e75a2c1a341821218b93bf7a9ac7d48

Merge "Explicitly log portal detections" into main am: d1c52e3eb0 am: 4090861c5e

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2826050

Change-Id: Ie8ee3db514a67fc5ff7524eb086f0c65d7067556
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

service/src/com/android/server/ConnectivityService.java

diff --git a/service/src/com/android/server/ConnectivityService.java b/service/src/com/android/server/ConnectivityService.java
index 29860f0..bb77a9d 100755
--- a/service/src/com/android/server/ConnectivityService.java
+++ b/service/src/com/android/server/ConnectivityService.java
@@ -4794,7 +4794,15 @@
                 final String logMsg = !TextUtils.isEmpty(redirectUrl)
                         ? " with redirect to " + redirectUrl
                         : "";
-                log(nai.toShortString() + " validation " + (valid ? "passed" : "failed") + logMsg);
+                final String statusMsg;
+                if (valid) {
+                    statusMsg = "passed";
+                } else if (!TextUtils.isEmpty(redirectUrl)) {
+                    statusMsg = "detected a portal";
+                } else {
+                    statusMsg = "failed";
+                }
+                log(nai.toShortString() + " validation " + statusMsg + logMsg);
             }
             if (valid != wasValidated) {
                 final FullScore oldScore = nai.getScore();