diff options
| author | Hugo Benichi <hugobenichi@google.com> | 2016-11-10 10:31:31 +0900 |
|---|---|---|
| committer | Christopher R. Palmer <crpalmer@gmail.com> | 2017-02-03 20:27:33 -0500 |
| commit | 4ba10939b7c05e4cf44d053ee8fa37a703c19e9b (patch) | |
| tree | ee0ca098a98987158ec5abe76069f3194f036d6f | |
| parent | bbec1eb03e8ea93910c369304c2335c5f736f967 (diff) | |
| download | frameworks_base-4ba10939b7c05e4cf44d053ee8fa37a703c19e9b.zip frameworks_base-4ba10939b7c05e4cf44d053ee8fa37a703c19e9b.tar.gz frameworks_base-4ba10939b7c05e4cf44d053ee8fa37a703c19e9b.tar.bz2 | |
resolve merge conflicts of 89aa6fb to mnc-dr-dev
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 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.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"); |