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

Commit 7f9bbae0 authored by Erik Kline's avatar Erik Kline Committed by android-build-merger
Browse files

Merge "Add null check to IpManager.dump()" am: 58406d1d am: c5bca697 

am: e398bae5

Change-Id: I172f23945a79191b777e2daf6795e2d228f510a6
parents 15e3d0db e398bae5

services/net/java/android/net/ip/IpManager.java

+1 −1
Original line number Diff line number Diff line
@@ -608,7 +608,7 @@ public class IpManager extends StateMachine { 
    }



    public void dump(FileDescriptor fd, PrintWriter writer, String[] args) {

        if (args.length > 0 && DUMP_ARG_CONFIRM.equals(args[0])) {

        if (args != null && args.length > 0 && DUMP_ARG_CONFIRM.equals(args[0])) {

            // Execute confirmConfiguration() and take no further action.

            confirmConfiguration();

            return;