Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix message names in dumpsys network_stack"

Browse Source
This commit is contained in:
Remi NGUYEN VAN
2019-03-28 00:14:31 +00:00
committed by Gerrit Code Review
parent 213812ba28 aaa7ecfd3b
commit 3c776e8793
4 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/NetworkStack/Android.bp
View File

@@ -49,6 +49,9 @@ java_defaults {
// Resources already included in NetworkStackBase // Resources already included in NetworkStackBase
resource_dirs: [], resource_dirs: [],
jarjar_rules: "jarjar-rules-shared.txt", jarjar_rules: "jarjar-rules-shared.txt",
optimize: {
proguard_flags_files: ["proguard.flags"],
},
// The permission configuration *must* be included to ensure security of the device // The permission configuration *must* be included to ensure security of the device
required: ["NetworkStackPermissionStub"], required: ["NetworkStackPermissionStub"],
} }

9
packages/NetworkStack/proguard.flags Normal file
View File

@@ -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_*;
}

1
packages/NetworkStack/src/android/net/dhcp/DhcpClient.java
View File

@@ -126,6 +126,7 @@ public class DhcpClient extends StateMachine {
// DhcpClient uses IpClient's handler. // DhcpClient uses IpClient's handler.
private static final int PUBLIC_BASE = IpClient.DHCPCLIENT_CMD_BASE; 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 */ /* Commands from controller to start/stop DHCP */
public static final int CMD_START_DHCP = PUBLIC_BASE + 1; public static final int CMD_START_DHCP = PUBLIC_BASE + 1;
public static final int CMD_STOP_DHCP = PUBLIC_BASE + 2; public static final int CMD_STOP_DHCP = PUBLIC_BASE + 2;

1
packages/NetworkStack/src/android/net/ip/IpClient.java
View File

@@ -282,6 +282,7 @@ public class IpClient extends StateMachine {
public static final String DUMP_ARG_CONFIRM = "confirm"; 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_TERMINATE_AFTER_STOP = 1;
private static final int CMD_STOP = 2; private static final int CMD_STOP = 2;
private static final int CMD_START = 3; private static final int CMD_START = 3;