LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a theoretical NPE

Browse Source 
Test: NetworkAgentTests
Bug: 153718627

Change-Id: I955b6dac6de48b12696dc640f131f5983ac552df
Merged-In: I08f57cce0cd85d5cd66e9a0ef948224290e9200e
(cherry picked from commit 31492c708746a51f70c74913a4d6cd97bf06ae63, aosp/1284575)
This commit is contained in:
Treehugger Robot
2020-04-10 19:11:51 +00:00
committed by Chalard Jean
parent ec5e7af977
commit b9db69f623
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/net/NetworkAgent.java
View File

@@ -812,7 +812,7 @@ public abstract class NetworkAgent {
* this is the destination the probes are being redirected to, otherwise {@code null}. * this is the destination the probes are being redirected to, otherwise {@code null}.
*/ */
public void onValidationStatus(@ValidationStatus int status, @Nullable Uri redirectUri) { 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 */ /** @hide TODO delete once subclasses have moved to onValidationStatus */
protected void networkStatus(int status, String redirectUrl) { protected void networkStatus(int status, String redirectUrl) {