commit c584a24ba1af0c831adf46fe57b69af396fb925c
author Irfan Sheriff <isheriff@android.com> Wed Aug 22 11:01:03 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Aug 22 11:01:03 2012 -0700
tree a28a0e509f7d2b9d5800f42aa3fd62e2e7efd5eb
parent 29c6f24b254b4ea1a7d8448980e736355e4badf6
parent 2140d1de47579db839b6a4ccc87394e80449d7a6

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

* commit '2140d1de47579db839b6a4ccc87394e80449d7a6':
  Avoid system_server crashing due to mac address is null

core/java/android/net/arp/ArpPeer.java

diff --git a/core/java/android/net/arp/ArpPeer.java b/core/java/android/net/arp/ArpPeer.java
index 8e666bc..6ba1e7c 100644
--- a/core/java/android/net/arp/ArpPeer.java
+++ b/core/java/android/net/arp/ArpPeer.java
@@ -53,9 +53,11 @@
         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) {