joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Fix a theoretical NPE" am: e21dccde6b

Browse source 
Change-Id: Idf4cb0acbfb9bc8fef43d42be477778e8ec2fc09
This commit is contained in:
Treehugger Robot 2020-04-10 16:44:25 +00:00 • committed by Automerger Merge Worker
commit 49021c2c68
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}.
*/
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) {