Merge "Do not stop FdEventsReader on handlePacket error" into rvc-dev

3 files changed, 3 insertions, 4 deletions

diff --git a/common/moduleutils/src/android/net/ip/NetlinkMonitor.java b/common/moduleutils/src/android/net/ip/NetlinkMonitor.java
index 1bbedb6..7c86beb 100644
--- a/common/moduleutils/src/android/net/ip/NetlinkMonitor.java
+++ b/common/moduleutils/src/android/net/ip/NetlinkMonitor.java
@@ -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);
             }
         }
diff --git a/common/moduleutils/src/android/net/util/FdEventsReader.java b/common/moduleutils/src/android/net/util/FdEventsReader.java
index 2b410e6..9045c01 100644
--- a/common/moduleutils/src/android/net/util/FdEventsReader.java
+++ b/common/moduleutils/src/android/net/util/FdEventsReader.java
@@ -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);
             }
         }
 
diff --git a/src/android/net/ip/IpReachabilityMonitor.java b/src/android/net/ip/IpReachabilityMonitor.java
index 2a0ca5d..3dbe662 100644
--- a/src/android/net/ip/IpReachabilityMonitor.java
+++ b/src/android/net/ip/IpReachabilityMonitor.java
@@ -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;