commit e21dccde6be84c2bea47cfcc2506df8969945d4b
author Treehugger Robot <treehugger-gerrit@google.com> Fri Apr 10 16:25:07 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Apr 10 16:25:07 2020 +0000
tree 7e6f3b6c87b218a1b38c0e44b3bbcea4d2400c5d
parent 311bd48fe839c0765d2f214ff6428e5aa1cb4431
parent 35a06972cc76d317d21503aec10f02701da4d1e8

Merge "Fix a theoretical NPE"

core/java/android/net/NetworkAgent.java

diff --git a/core/java/android/net/NetworkAgent.java b/core/java/android/net/NetworkAgent.java
index e9bcefe..31d7d08 100644
--- a/core/java/android/net/NetworkAgent.java
+++ b/core/java/android/net/NetworkAgent.java
@@ -812,7 +812,7 @@
      *        this is the destination the probes are being redirected to, otherwise {@code null}.
      */
     public void onValidationStatus(@ValidationStatus int status, @Nullable Uri redirectUri) {
-        networkStatus(status, redirectUri.toString());
+        networkStatus(status, null == redirectUri ? "" : redirectUri.toString());
     }
     /** @hide TODO delete once subclasses have moved to onValidationStatus */
     protected void networkStatus(int status, String redirectUrl) {