Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 741f3513 authored by Irfan Sheriff's avatar Irfan Sheriff Committed by Android Git Automerger
Browse files

am 2f104185: am 04e83d39: Merge "Fix reference counting of wifi locks" into jb-dev 

* commit '2f104185':
  Fix reference counting of wifi locks
parents 0b30d758 2f104185

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

+2 −2
Original line number Diff line number Diff line
@@ -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) {