resolve merge conflicts of 89aa6fb to mnc-dr-dev
Change-Id: I9e4e538081600be6a8199060bcb0d4040c071a22
(cherry picked from commit a0cfb157ecf69c948e37db5a9df6cb8a8102874c)
diff --git a/services/net/java/android/net/dhcp/DhcpClient.java b/services/net/java/android/net/dhcp/DhcpClient.java
index c9efc69..ac0c6a3 100644
--- a/services/net/java/android/net/dhcp/DhcpClient.java
+++ b/services/net/java/android/net/dhcp/DhcpClient.java
@@ -43,6 +43,7 @@
import android.system.ErrnoException;
import android.system.Os;
import android.system.PacketSocketAddress;
+import android.util.EventLog;
import android.util.Log;
import android.util.TimeUtils;
@@ -372,6 +373,14 @@
if (PACKET_DBG) {
Log.d(TAG, HexDump.dumpHexString(mPacket, 0, length));
}
+ } 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);
}
}
maybeLog("Receive thread stopped");