Merge "Fix the probe wake lock duration when mcast_resolicit is enabled." am: e5a6619db9

Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/1890315

Change-Id: Ic801105c0f3f4784c43054973baa6305c0402d5c

src/android/net/ip/IpReachabilityMonitor.java

diff --git a/src/android/net/ip/IpReachabilityMonitor.java b/src/android/net/ip/IpReachabilityMonitor.java
index 0f199e2..435d4ca 100644
--- a/src/android/net/ip/IpReachabilityMonitor.java
+++ b/src/android/net/ip/IpReachabilityMonitor.java
@@ -570,7 +570,7 @@
             }
         }
 
-        mNumSolicits = numSolicits;
+        mNumSolicits = isMulticastResolicitEnabled() ? (numSolicits + numResolicits) : numSolicits;
         mInterSolicitIntervalMs = interSolicitIntervalMs;
     }