From 2c02da2bc62c4dfef684ea381be02a4e568b73d0 Mon Sep 17 00:00:00 2001 From: Irfan Sheriff Date: Wed, 2 May 2012 14:40:16 -0700 Subject: Fix reference counting of wifi locks Bug: 6105898 Change-Id: I7368de91fa4aa63fd97dda0ee91d810aaaa53d8b --- wifi/java/android/net/wifi/WifiManager.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'wifi/java/android/net') diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java index 8aa613b..36f38f9 100644 --- a/wifi/java/android/net/wifi/WifiManager.java +++ b/wifi/java/android/net/wifi/WifiManager.java @@ -1557,7 +1557,7 @@ public class WifiManager { */ public void acquire() { synchronized (mBinder) { - if (mRefCounted ? (++mRefCount > 0) : (!mHeld)) { + if (mRefCounted ? (++mRefCount == 1) : (!mHeld)) { try { mService.acquireWifiLock(mBinder, mLockType, mTag, mWorkSource); synchronized (WifiManager.this) { @@ -1786,7 +1786,7 @@ public class WifiManager { */ public void acquire() { synchronized (mBinder) { - if (mRefCounted ? (++mRefCount > 0) : (!mHeld)) { + if (mRefCounted ? (++mRefCount == 1) : (!mHeld)) { try { mService.acquireMulticastLock(mBinder, mTag); synchronized (WifiManager.this) { -- cgit v1.1