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

Merge "Fix a theoretical NPE" into rvc-dev am: ce6aa16b80

Browse Source 
Change-Id: I82c5df71163bfe14a5d0eb6b8fb3628cb67defb6
This commit is contained in:
Chalard Jean
2020-04-11 05:16:38 +00:00
committed by Automerger Merge Worker
parent 082a9f45bf b9db69f623
commit dbcce5454b
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) {