Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix reference counting of wifi locks" into jb-dev

Browse Source
This commit is contained in:
Irfan Sheriff
2012-05-02 16:25:34 -07:00
committed by Android (Google) Code Review
parent d69c367577 2c02da2bc6
commit 04e83d3952
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wifi/java/android/net/wifi/WifiManager.java
View File

@@ -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) {