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

Commit f31dd841 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Do not stop FdEventsReader on handlePacket error" into rvc-dev am: db03d164 am: fbae0a7a 

Change-Id: I01e1b4bce518295674fc925e098d5316d2e341fa
parents 632bd1b7 fbae0a7a

common/moduleutils/src/android/net/ip/NetlinkMonitor.java

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ public class NetlinkMonitor extends PacketReader { 
                }



                processNetlinkMessage(nlMsg, whenMs);

            } catch (Throwable e) {

            } catch (Exception e) {

                mLog.e("Error handling netlink message", e);

            }

        }

common/moduleutils/src/android/net/util/FdEventsReader.java

+1 −2
Original line number Diff line number Diff line
@@ -245,8 +245,7 @@ public abstract class FdEventsReader<BufferType> { 
                handlePacket(mBuffer, bytesRead);

            } catch (Exception e) {

                logError("handlePacket error: ", e);

                Log.wtf(FdEventsReader.class.getSimpleName(), "Error handling packet: stopping", e);

                break;

                Log.wtf(FdEventsReader.class.getSimpleName(), "Error handling packet", e);

            }

        }

src/android/net/ip/IpReachabilityMonitor.java

+1 −1
Original line number Diff line number Diff line
@@ -345,7 +345,7 @@ public class IpReachabilityMonitor { 


            // Find all the neighbors that have gone into FAILED state.

            // Ignore entries for which we have never received an event. If there are neighbors

            // that never respond to ARP/ND, the kernel will send several FAILED event, then

            // that never respond to ARP/ND, the kernel will send several FAILED events, then

            // an INCOMPLETE event, and then more FAILED events. The INCOMPLETE event will

            // populate the map and the subsequent FAILED event will be processed.

            if (val == null || val.nudState != StructNdMsg.NUD_FAILED) continue;