commit 4090861c5e75a2c1a341821218b93bf7a9ac7d48
author Remi NGUYEN VAN <reminv@google.com> Fri May 31 11:37:31 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri May 31 11:37:31 2024 +0000
tree 68a92a27a0a70322982edc02b2d1c0b3d6344034
parent f5e51f458b8c67a1c9f0e3408626ecc5dfc8737d
parent d1c52e3eb0aa13f8e671d5141c84183f2ff82880

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

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

Change-Id: I157f116c0d759fe780f4611c4a91da90cb2b14f3
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();