diff options
| author | 2020-04-11 05:06:32 +0000 | |
|---|---|---|
| committer | 2020-04-11 05:06:32 +0000 | |
| commit | ce6aa16b8074a9ec1c11f5db045d8924f7ef9d35 (patch) | |
| tree | 71519b3fd0cf2f9f943d576aae265759c7fdfb6f | |
| parent | 2a639e9786d070c17805dde0140e7cd6b19deac2 (diff) | |
| parent | 67ac7abd21f7e1f7640f4a39e3b338409dc63082 (diff) | |
Merge "Fix a theoretical NPE" into rvc-dev
| -rw-r--r-- | core/java/android/net/NetworkAgent.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/net/NetworkAgent.java b/core/java/android/net/NetworkAgent.java index e9bcefef50c7..31d7d0820996 100644 --- a/core/java/android/net/NetworkAgent.java +++ b/core/java/android/net/NetworkAgent.java @@ -812,7 +812,7 @@ public abstract class NetworkAgent { * 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) { |