commit e5a6619db956da54aa06f687b0cac7753bdeabf6
author Xiao Ma <xiaom@google.com> Fri Nov 12 09:41:41 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Nov 12 09:41:41 2021 +0000
tree 0ddb45208033eacac51cc98d5730641f56078042
parent 0999fd2063538599410086d48de54e748156581b
parent 54942e8de59a8c9834e5916a228834c15edd41a6

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

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;
     }