diff options
author | Hugo Benichi <hugobenichi@google.com> | 2016-11-10 10:31:31 +0900 |
---|---|---|
committer | The Android Automerger <android-build@android.com> | 2016-12-06 16:33:28 -0800 |
commit | db66afe61e52f81f185593a2b6dd63c436ce9014 (patch) | |
tree | 7b1423780a071e5d650dc69e5fbd2cc3e54c3729 | |
parent | 94946899615c2af2eaa39895a1242499d078c3c8 (diff) | |
download | base-android-6.0.1_r78.tar.gz |
resolve merge conflicts of 89aa6fb to mnc-dr-devandroid-6.0.1_r78
Change-Id: I9e4e538081600be6a8199060bcb0d4040c071a22
(cherry picked from commit a0cfb157ecf69c948e37db5a9df6cb8a8102874c)
-rw-r--r-- | services/net/java/android/net/dhcp/DhcpClient.java | 9 |
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 c9efc69b5979..ac0c6a3aec65 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.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.TimeUtils; @@ -372,6 +373,14 @@ public class DhcpClient extends BaseDhcpStateMachine { 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"); |