auto import from //branches/cupcake/...@132276

1 files changed, 6 insertions, 13 deletions

diff --git a/core/java/android/bluetooth/ScoSocket.java b/core/java/android/bluetooth/ScoSocket.java
index 75b3329..a43a08b 100644
--- a/core/java/android/bluetooth/ScoSocket.java
+++ b/core/java/android/bluetooth/ScoSocket.java
@@ -16,17 +16,12 @@
 
 package android.bluetooth;
 
-import android.content.Context;
 import android.os.Handler;
 import android.os.Message;
 import android.os.PowerManager;
 import android.os.PowerManager.WakeLock;
 import android.util.Log;
 
-import java.io.IOException;
-import java.lang.Thread;
-
-
 /**
  * The Android Bluetooth API is not finalized, and *will* change. Use at your
  * own risk.
@@ -56,7 +51,7 @@ public class ScoSocket {
     private int mConnectedCode;
     private int mClosedCode;
 
-    private WakeLock mWakeLock;  // held while STATE_CONNECTING or STATE_CONNECTED
+    private WakeLock mWakeLock;  // held while in STATE_CONNECTING
 
     static {
         classInitNative();
@@ -130,6 +125,7 @@ public class ScoSocket {
 
     public synchronized void close() {
         if (DBG) log(this + " SCO OBJECT close() mState = " + mState);
+        acquireWakeLock();
         mState = STATE_CLOSED;
         closeNative();
         releaseWakeLock();
@@ -152,19 +148,16 @@ public class ScoSocket {
             mState = STATE_CLOSED;
         }
         mHandler.obtainMessage(mConnectedCode, mState, -1, this).sendToTarget();
-        if (result < 0) {
-            releaseWakeLock();
-        }
+        releaseWakeLock();
     }
 
     private synchronized void onAccepted(int result) {
         if (VDBG) log("onAccepted() " + this);
         if (mState != STATE_ACCEPT) {
-            if (DBG) log("Strange state" + this);
+            if (DBG) log("Strange state " + this);
             return;
         }
         if (result >= 0) {
-            acquireWakeLock();
             mState = STATE_CONNECTED;
         } else {
             mState = STATE_CLOSED;
@@ -184,13 +177,13 @@ public class ScoSocket {
     private void acquireWakeLock() {
         if (!mWakeLock.isHeld()) {
             mWakeLock.acquire();
-            if (VDBG) log("mWakeLock.acquire()" + this);
+            if (VDBG) log("mWakeLock.acquire() " + this);
         }
     }
 
     private void releaseWakeLock() {
         if (mWakeLock.isHeld()) {
-            if (VDBG) log("mWakeLock.release()" + this);
+            if (VDBG) log("mWakeLock.release() " + this);
             mWakeLock.release();
         }
     }