summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Scherba <dscherba@quicinc.com>2010-04-16 18:12:50 -0400
committerSteve Kondik <shade@chemlab.org>2010-08-15 07:22:13 -0400
commitea6b26ff4d4b5717b314b755a31a870918d25805 (patch)
treef4544de89d26ec568c9583b9ac3f7e59e8cb3d19
parent85905c7e1f987db174167f575b65ab92eaf2dfb1 (diff)
downloadframeworks_base-ea6b26ff4d4b5717b314b755a31a870918d25805.zip
frameworks_base-ea6b26ff4d4b5717b314b755a31a870918d25805.tar.gz
frameworks_base-ea6b26ff4d4b5717b314b755a31a870918d25805.tar.bz2
Bluetooth: Disable SDP timeout handler on SDP completion
The service discovery (SDP) timeout handler set in fetchRemoteUuids() needs to be removed when service discovery completes. Otherwise, the timeout handler can terminate subsequent service discovery operations. Change-Id: I2ec2cbd8c080180114e18ed2b2059f617d44f93e CRs-fixed: 235007
-rw-r--r--core/java/android/server/BluetoothService.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/server/BluetoothService.java b/core/java/android/server/BluetoothService.java
index 7095dbe..6f6f866 100644
--- a/core/java/android/server/BluetoothService.java
+++ b/core/java/android/server/BluetoothService.java
@@ -1557,6 +1557,9 @@ public class BluetoothService extends IBluetooth.Stub {
int channel;
if (DBG) log("updateDeviceServiceChannelCache(" + address + ")");
+ // Remove service channel timeout handler
+ mHandler.removeMessages(MESSAGE_UUID_INTENT);
+
ArrayList<ParcelUuid> applicationUuids = new ArrayList();
synchronized (this) {