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

Commit 46ac22c9 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "Fix message names in dumpsys network_stack" am: 3c776e87 am:... 

Merge "Merge "Fix message names in dumpsys network_stack" am: 3c776e87 am: bae08510 am: f93d3f9a"
parents d2faa852 3049d3b6

packages/NetworkStack/Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -49,6 +49,9 @@ java_defaults { 
    // Resources already included in NetworkStackBase

    resource_dirs: [],

    jarjar_rules: "jarjar-rules-shared.txt",

    optimize: {

        proguard_flags_files: ["proguard.flags"],

    },

    // The permission configuration *must* be included to ensure security of the device

    required: ["NetworkStackPermissionStub"],

}

packages/NetworkStack/proguard.flags

0 → 100644
+9 −0
Original line number Diff line number Diff line 
-keepclassmembers class android.net.ip.IpClient {

    static final int CMD_*;

    static final int EVENT_*;

}



-keepclassmembers class android.net.dhcp.DhcpClient {

    static final int CMD_*;

    static final int EVENT_*;

}

packages/NetworkStack/src/android/net/dhcp/DhcpClient.java

+1 −0
Original line number Diff line number Diff line
@@ -126,6 +126,7 @@ public class DhcpClient extends StateMachine { 
    // DhcpClient uses IpClient's handler.

    private static final int PUBLIC_BASE = IpClient.DHCPCLIENT_CMD_BASE;



    // Below constants are picked up by MessageUtils and exempt from ProGuard optimization.

    /* Commands from controller to start/stop DHCP */

    public static final int CMD_START_DHCP                  = PUBLIC_BASE + 1;

    public static final int CMD_STOP_DHCP                   = PUBLIC_BASE + 2;

packages/NetworkStack/src/android/net/ip/IpClient.java

+1 −0
Original line number Diff line number Diff line
@@ -282,6 +282,7 @@ public class IpClient extends StateMachine { 


    public static final String DUMP_ARG_CONFIRM = "confirm";



    // Below constants are picked up by MessageUtils and exempt from ProGuard optimization.

    private static final int CMD_TERMINATE_AFTER_STOP             = 1;

    private static final int CMD_STOP                             = 2;

    private static final int CMD_START                            = 3;