summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Wink Saville <wink@google.com> 2011-10-13 17:42:58 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2011-10-13 17:42:58 -0700
commitd54bcad4bbb02eec47b26f6466bc01ff4e24f449 (patch)
tree8a9c4024a9adce3f1303f8d2ff731df5d523e7cc
parentbc883f4cf48ef1e0e533aba423d8ff3529010975 (diff)
parent8a058cbf12c590db810fe8d9fab6f4f614909329 (diff)
am 8a058cbf: Merge "In releaseWifiLockLocked call noteReleaseWifiLock." into ics-mr0
* commit '8a058cbf12c590db810fe8d9fab6f4f614909329': In releaseWifiLockLocked call noteReleaseWifiLock.
-rw-r--r--services/java/com/android/server/WifiService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/java/com/android/server/WifiService.java b/services/java/com/android/server/WifiService.java
index 660681bbdfd2..5bfe6f8bbc2f 100644
--- a/services/java/com/android/server/WifiService.java
+++ b/services/java/com/android/server/WifiService.java
@@ -1402,7 +1402,7 @@ public class WifiService extends IWifiManager.Stub {
long ident = Binder.clearCallingIdentity();
try {
if (hadLock) {
- noteAcquireWifiLock(wifiLock);
+ noteReleaseWifiLock(wifiLock);
switch(wifiLock.mMode) {
case WifiManager.WIFI_MODE_FULL:
++mFullLocksReleased;