diff options
| author | Irfan Sheriff <isheriff@android.com> | 2012-08-22 10:48:23 -0700 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-08-22 10:48:23 -0700 |
| commit | 2140d1de47579db839b6a4ccc87394e80449d7a6 (patch) | |
| tree | acae188e0520f2a64300ed330634733f3f94b14d | |
| parent | 6ffe2594674f250c16c5e3055aa69680efaa6f69 (diff) | |
| parent | 21326d8b77cfd1567d87d5ebe3e327b744632e24 (diff) | |
| download | frameworks_base-2140d1de47579db839b6a4ccc87394e80449d7a6.zip frameworks_base-2140d1de47579db839b6a4ccc87394e80449d7a6.tar.gz frameworks_base-2140d1de47579db839b6a4ccc87394e80449d7a6.tar.bz2 | |
Merge "Avoid system_server crashing due to mac address is null"
| -rw-r--r-- | core/java/android/net/arp/ArpPeer.java | 8 |
1 files changed, 5 insertions, 3 deletions
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 @@ 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) { |