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

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

Browse Source 
Change-Id: I854eddda678934d0da083d22b99b855ed57fd644
This commit is contained in:
Hugo Benichi
2016-11-11 11:24:23 +09:00
parent 69246f0565 b446883f3f
commit 476da32d86
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

@@ -39,6 +39,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.SparseArray; import android.util.SparseArray;
import android.util.TimeUtils; import android.util.TimeUtils;
@@ -364,6 +365,14 @@ public class DhcpClient extends StateMachine {
Log.d(TAG, HexDump.dumpHexString(mPacket, 0, length)); Log.d(TAG, HexDump.dumpHexString(mPacket, 0, length));
} }
DhcpErrorEvent.logParseError(mIfaceName, e.errorCode); 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"); if (DBG) Log.d(TAG, "Receive thread stopped");