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

am dfe55787: am c584a24b: am 2140d1de: Merge "Avoid system_server crashing due to mac address is null"

Browse Source 
* commit 'dfe5578771080bf225225d3c903e186d92f5b274':
  Avoid system_server crashing due to mac address is null
This commit is contained in:
Irfan Sheriff
2012-08-22 11:04:53 -07:00
committed by Android Git Automerger
parent 5ee6095e25 dfe5578771
commit a63d11de44
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -58,9 +58,11 @@ public class ArpPeer {
mInterfaceName = interfaceName;
mMyAddr = myAddr;
for (int i = 0; i < MAC_ADDR_LENGTH; i++) {
mMyMac[i] = (byte) Integer.parseInt(mac.substring(
i*3, (i*3) + 2), 16);
if (mac != null) {
for (int i = 0; i < MAC_ADDR_LENGTH; i++) {
mMyMac[i] = (byte) Integer.parseInt(mac.substring(
i*3, (i*3) + 2), 16);
}
}
if (myAddr instanceof Inet6Address || peer instanceof Inet6Address) {