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

Merge "Fix a theoretical NPE" am: 6334d49d44 am: 92c8e43252 am: c53b4498be am: 0e51f38933

Browse Source 
Change-Id: Ia0944c7e7b3a2fd88e5e234d30e21e999e3fa1d4
This commit is contained in:
Treehugger Robot
2020-04-10 18:55:08 +00:00
committed by Automerger Merge Worker
parent c61672e5ef 0e51f38933
commit 8d2ccfc1dc
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) {