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

Merge "Avoid system_server crashing due to mac address is null"

Browse Source
This commit is contained in:
Irfan Sheriff
2012-08-22 10:48:23 -07:00
committed by android code review
parent 6ffe259467 21326d8b77
commit 2140d1de47
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/net/arp/ArpPeer.java
View File

@@ -53,10 +53,12 @@ public class ArpPeer {
mInterfaceName = interfaceName; mInterfaceName = interfaceName;
mMyAddr = myAddr; mMyAddr = myAddr;
if (mac != null) {
for (int i = 0; i < MAC_ADDR_LENGTH; i++) { for (int i = 0; i < MAC_ADDR_LENGTH; i++) {
mMyMac[i] = (byte) Integer.parseInt(mac.substring( mMyMac[i] = (byte) Integer.parseInt(mac.substring(
i*3, (i*3) + 2), 16); i*3, (i*3) + 2), 16);
} }
}
if (myAddr instanceof Inet6Address || peer instanceof Inet6Address) { if (myAddr instanceof Inet6Address || peer instanceof Inet6Address) {
throw new IllegalArgumentException("IPv6 unsupported"); throw new IllegalArgumentException("IPv6 unsupported");