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

Author: isheriff

wifi/java/android/net/wifi/WifiManager.java

@@ -1557,7 +1557,7 @@ private WifiLock(int lockType, String tag) {
          */
         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 @@ private MulticastLock(String tag) {
          */
         public void acquire() {
             synchronized (mBinder) {
-                if (mRefCounted ? (++mRefCount > 0) : (!mHeld)) {
+                if (mRefCounted ? (++mRefCount == 1) : (!mHeld)) {
                     try {
                         mService.acquireMulticastLock(mBinder, mTag);
                         synchronized (WifiManager.this) {