Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0e013c9b authored by Hugo Benichi's avatar Hugo Benichi Committed by android-build-merger
Browse files

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

am: a0cfb157

Change-Id: I10ee0e4e8ef8a1785a16f6f83b8bb38b8847e85a
parents 06a55fb5 a0cfb157

services/net/java/android/net/dhcp/DhcpClient.java

+9 −0
Original line number Diff line number Diff line
@@ -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");