DO NOT MERGE resolve merge conflicts of b446883 to nyc-dev

Change-Id: I854eddda678934d0da083d22b99b855ed57fd644

1 files changed, 9 insertions, 0 deletions

diff --git a/services/net/java/android/net/dhcp/DhcpClient.java b/services/net/java/android/net/dhcp/DhcpClient.java
index 96c852bf55f5..97677ffb65ed 100644
--- a/services/net/java/android/net/dhcp/DhcpClient.java
+++ b/services/net/java/android/net/dhcp/DhcpClient.java
@@ -39,6 +39,7 @@ import android.os.SystemClock;
 import android.system.ErrnoException;
 import android.system.Os;
 import android.system.PacketSocketAddress;
+import android.util.EventLog;
 import android.util.Log;
 import android.util.SparseArray;
 import android.util.TimeUtils;
@@ -364,6 +365,14 @@ public class DhcpClient extends StateMachine {
                         Log.d(TAG, HexDump.dumpHexString(mPacket, 0, length));
                     }
                     DhcpErrorEvent.logParseError(mIfaceName, e.errorCode);
+                } catch (Exception e) {
+                    // SafetyNet logging for b/31850211
+                    int snetTagId = 0x534e4554;
+                    String bugId = "31850211";
+                    int uid = -1;
+                    String data = e.getClass().getName();
+                    EventLog.writeEvent(snetTagId, bugId, uid, data);
+                    Log.e(TAG, "Failed to parse DHCP packet", e);
                 }
             }
             if (DBG) Log.d(TAG, "Receive thread stopped");