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

Commit ceabc645 authored by Robert Greenwalt's avatar Robert Greenwalt Committed by Android Git Automerger
Browse files

am 16cb04ab: Merge change If1acb2dd into eclair 

Merge commit '16cb04ab' into eclair-mr2

* commit '16cb04ab':
  Add a little logging to diagnose wifi cycle bug
parents 7d4acc53 16cb04ab

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

+9 −4
Original line number Diff line number Diff line
@@ -1716,6 +1716,8 @@ public class WifiService extends IWifiManager.Stub { 
    }



    private boolean acquireWifiLockLocked(WifiLock wifiLock) {

        Log.d(TAG, "acquireWifiLockLocked: " + wifiLock);



        mLocks.addLock(wifiLock);



        int uid = Binder.getCallingUid();
@@ -1751,6 +1753,9 @@ public class WifiService extends IWifiManager.Stub { 
        boolean hadLock;



        WifiLock wifiLock = mLocks.removeLock(lock);



        Log.d(TAG, "releaseWifiLockLocked: " + wifiLock);



        hadLock = (wifiLock != null);



        if (hadLock) {
@@ -1772,7 +1777,7 @@ public class WifiService extends IWifiManager.Stub { 
                Binder.restoreCallingIdentity(ident);

            }

        }

        

        // TODO - should this only happen if you hadLock?

        updateWifiState();

        return hadLock;

    }