diff options
| author | Tao Liejun <L.J.Tao@motorola.com> | 2009-08-04 17:41:43 +0800 |
|---|---|---|
| committer | Nick Pelly <npelly@google.com> | 2009-08-06 10:38:46 -0700 |
| commit | 52236de777c23788df8147de15912a57e8bc36dd (patch) | |
| tree | ad0d47028f65af4c8e0cba7079c4f69e03ac3ed7 /src/com/android/bluetooth/opp/BluetoothOppTransfer.java | |
| parent | d65cd7f65d0ba827c94cb9a6c1ef8343b6982d9d (diff) | |
| download | android_packages_apps_Bluetooth-52236de777c23788df8147de15912a57e8bc36dd.tar.gz android_packages_apps_Bluetooth-52236de777c23788df8147de15912a57e8bc36dd.tar.bz2 android_packages_apps_Bluetooth-52236de777c23788df8147de15912a57e8bc36dd.zip | |
Fix a few OPP issues
Grab wakelock for server session
Fix send small file bug
Diffstat (limited to 'src/com/android/bluetooth/opp/BluetoothOppTransfer.java')
| -rw-r--r-- | src/com/android/bluetooth/opp/BluetoothOppTransfer.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/com/android/bluetooth/opp/BluetoothOppTransfer.java b/src/com/android/bluetooth/opp/BluetoothOppTransfer.java index cc97fcf32..339f069c5 100644 --- a/src/com/android/bluetooth/opp/BluetoothOppTransfer.java +++ b/src/com/android/bluetooth/opp/BluetoothOppTransfer.java @@ -578,9 +578,11 @@ public class BluetoothOppTransfer implements BluetoothOppBatchListener { String savedUuid = null; boolean isOpush = false; if (uuids != null) { - for (String uuid : uuids) { + for (String uuid :uuids) { UUID remoteUuid = UUID.fromString(uuid); - Log.v(TAG, "SDP UUID: remoteUuid = " + remoteUuid); + if (Constants.LOGVV) { + Log.v(TAG, "SDP UUID: remoteUuid = " + remoteUuid); + } if (remoteUuid.equals(OPUSH_UUID128)) { savedUuid = uuid; isOpush = true; @@ -602,7 +604,6 @@ public class BluetoothOppTransfer implements BluetoothOppBatchListener { } - Log.v(TAG, "SDP UUID: TYPE_UNKNOWN"); Log.e(TAG, "SDP query failed!"); markBatchFailed(BluetoothShare.STATUS_CONNECTION_ERROR); mBatch.mStatus = Constants.BATCH_STATUS_FAILED; @@ -761,12 +762,11 @@ public class BluetoothOppTransfer implements BluetoothOppBatchListener { } private void markConnectionFailed(BluetoothSocket s) { - // TODO add destroy try { s.close(); } catch (IOException e) { if (Constants.LOGVV) { - Log.v(TAG, "Error when close socket"); + Log.e(TAG, "Error when close socket"); } } mSessionHandler.obtainMessage(RFCOMM_ERROR).sendToTarget(); |