diff options
| author | Remi NGUYEN VAN <reminv@google.com> | 2019-03-27 17:29:57 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-03-27 17:29:57 -0700 |
| commit | 6897ece80dbf9495c545321d4270e84ecf9eb0f6 (patch) | |
| tree | df66906ae079916835cd8302b4e87ce044fca279 | |
| parent | fee34c1b119596187ff08d0b3c091300702dc12e (diff) | |
| parent | 23dd932915780e1d604fa4e4acaf7d478dc8c8ab (diff) | |
Merge "Fix message names in dumpsys network_stack"
am: 3c776e8793
Change-Id: I5431c0a8b981716e02804cb13f5c59f65a89828c
| -rw-r--r-- | Android.bp | 3 | ||||
| -rw-r--r-- | proguard.flags | 9 | ||||
| -rw-r--r-- | src/android/net/dhcp/DhcpClient.java | 1 | ||||
| -rw-r--r-- | src/android/net/ip/IpClient.java | 1 |
4 files changed, 14 insertions, 0 deletions
@@ -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"], } diff --git a/proguard.flags b/proguard.flags new file mode 100644 index 0000000..c60f6c3 --- /dev/null +++ b/proguard.flags @@ -0,0 +1,9 @@ +-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_*; +} diff --git a/src/android/net/dhcp/DhcpClient.java b/src/android/net/dhcp/DhcpClient.java index c6dd011..79d6a55 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; |