Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve merge conflicts of 89aa6fb to mnc-dr-dev

Browse Source 
Change-Id: I9e4e538081600be6a8199060bcb0d4040c071a22
This commit is contained in:
Hugo Benichi
2016-11-10 10:31:31 +09:00
parent eda0b0078e 89aa6fb4d8
commit a0cfb157ec
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/net/java/android/net/dhcp/DhcpClient.java
View File

@@ -43,6 +43,7 @@ import android.os.SystemClock;
import android.system.ErrnoException; import android.system.ErrnoException;
import android.system.Os; import android.system.Os;
import android.system.PacketSocketAddress; import android.system.PacketSocketAddress;
import android.util.EventLog;
import android.util.Log; import android.util.Log;
import android.util.TimeUtils; import android.util.TimeUtils;
@@ -372,6 +373,14 @@ public class DhcpClient extends BaseDhcpStateMachine {
if (PACKET_DBG) { if (PACKET_DBG) {
Log.d(TAG, HexDump.dumpHexString(mPacket, 0, length)); 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"); maybeLog("Receive thread stopped");