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

Commit 550a0e9b authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix a theoretical NPE" am: c312053b am: 668661d9 am: df0ee25d 

Change-Id: Ief314b04963c0ddaf027823a21ee70e84870a94a
parents 70a9620b df0ee25d

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) {