commit d1c52e3eb0aa13f8e671d5141c84183f2ff82880
author Remi NGUYEN VAN <reminv@google.com> Fri May 31 11:27:11 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri May 31 11:27:11 2024 +0000
tree 2500e60fa03face91b4dcd540efa251c12dea682
parent 8a14358e16bb8a3259af3753ece167a5214b38ce
parent 9da8b434757e6edb2e825351af5f84df5e7f0f58

Merge "Explicitly log portal detections" into main

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();