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

Commit 5812e648 authored by Lorenzo Colitti's avatar Lorenzo Colitti
Browse files

Rename IpManager#dumpApf to #dump and change its signature. 

Also give it a bit of indentation.

Bug: 26991160
Change-Id: I8a85276e76e15f452075931747552b486598f0e9
parent 1e632ba4

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

+10 −6
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ import com.android.internal.util.State; 
import com.android.internal.util.StateMachine;

import com.android.server.net.NetlinkTracker;



import java.io.FileDescriptor;

import java.io.PrintWriter;

import java.net.InetAddress;

import java.net.NetworkInterface;
@@ -211,6 +212,8 @@ public class IpManager extends StateMachine { 
        }

    }



    public static final String DUMP_ARG = "ipmanager";



    private static final int CMD_STOP = 1;

    private static final int CMD_START = 2;

    private static final int CMD_CONFIRM = 3;
@@ -393,17 +396,18 @@ public class IpManager extends StateMachine { 
        }

    }



    public void dumpApf(PrintWriter writer) {

        writer.println("--------------------------------------------------------------------");

        writer.println("APF dump:");

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

        IndentingPrintWriter pw = new IndentingPrintWriter(writer, "  ");

        pw.println("APF dump:");

        pw.increaseIndent();

        // Thread-unsafe access to mApfFilter but just used for debugging.

        ApfFilter apfFilter = mApfFilter;

        if (apfFilter != null) {

            apfFilter.dump(new IndentingPrintWriter(writer, "  "));

            apfFilter.dump(pw);

        } else {

            writer.println("No apf support");

            pw.println("No apf support");

        }

        writer.println("--------------------------------------------------------------------");

        pw.decreaseIndent();

    }