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

Commit b446883f 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 

am: 0e013c9b

Change-Id: Iab130296a52ba31005344793ed07c22003ac729f
parents 0e11e0d9 0e013c9b

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

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