Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 96f01a4f authored by Chalard Jean's avatar Chalard Jean Committed by Automerger Merge Worker
Browse files

Merge "Fix a theoretical NPE" into rvc-dev am: ce6aa16b am: 67cdd0d1 

Change-Id: Ief48e00e7a6ee1c947c13570b035c08e042a8473
parents 8e4488c0 67cdd0d1

core/java/android/net/NetworkAgent.java

+1 −1
Original line number Diff line number Diff line
@@ -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) {