commit 8d1668da94c1369f6d68e71007c3255336cb6b92
author Zheng BaoZhong <bao-zhong@motorola.com> Wed Aug 05 08:57:49 2009 -0400
committer Mike Lockwood <lockwood@android.com> Wed Aug 05 08:57:49 2009 -0400
tree 6160d98ef5ff4539ca27b225f015ab6e8bc2e401
parent 0f0767d4daa847314bd9473ef3650d26d1c51c8c

Wifi: Fix synchronization bug in multicast lock.

Signed-off-by: Mike Lockwood <lockwood@android.com>

services/java/com/android/server/WifiService.java

diff --git a/services/java/com/android/server/WifiService.java b/services/java/com/android/server/WifiService.java
index d4e57d2..fae987a 100644
--- a/services/java/com/android/server/WifiService.java
+++ b/services/java/com/android/server/WifiService.java
@@ -1889,7 +1889,9 @@
             // our new size == 1 (first call), but this function won't
             // be called often and by making the stopPacket call each
             // time we're less fragile and self-healing.
-            WifiNative.stopPacketFiltering();
+            synchronized (mWifiStateTracker) {
+                WifiNative.stopPacketFiltering();
+            }
         }
 
         int uid = Binder.getCallingUid();
@@ -1925,7 +1927,9 @@
             removed.unlinkDeathRecipient();
         }
         if (mMulticasters.size() == 0) {
-            WifiNative.startPacketFiltering();
+            synchronized (mWifiStateTracker) {
+                WifiNative.startPacketFiltering();
+            }
         }
 
         Long ident = Binder.clearCallingIdentity();