From 776d7f79a8ab59908b6f2d494fa95bf644e0c001 Mon Sep 17 00:00:00 2001 From: Remi NGUYEN VAN Date: Tue, 26 Mar 2019 14:58:08 +0900 Subject: Fix message names in dumpsys network_stack Constants were stripped out by ProGuard, so MessageUtils.findMessageNames would fail to find them. Test: flashed, dumpsys network_stack shows message names Fixes: 124619824 Change-Id: I285ce2ab52cdff48f17b422285a635bd34243498 --- src/android/net/dhcp/DhcpClient.java | 1 + src/android/net/ip/IpClient.java | 1 + 2 files changed, 2 insertions(+) (limited to 'src') diff --git a/src/android/net/dhcp/DhcpClient.java b/src/android/net/dhcp/DhcpClient.java index 0b7809e..1e724c2 100644 --- a/src/android/net/dhcp/DhcpClient.java +++ b/src/android/net/dhcp/DhcpClient.java @@ -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; diff --git a/src/android/net/ip/IpClient.java b/src/android/net/ip/IpClient.java index 346ac68..7a06af4 100644 --- a/src/android/net/ip/IpClient.java +++ b/src/android/net/ip/IpClient.java @@ -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; -- cgit v1.2.3