Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: Ief48e00e7a6ee1c947c13570b035c08e042a8473
This commit is contained in:
Chalard Jean
2020-04-11 05:35:50 +00:00
committed by Automerger Merge Worker
parent 8e4488c033 67cdd0d1a1
commit 96f01a4f80
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) {