Merge "Increase the setup-sdp delay to cover for all the devices." into jb-dev

Author: Matthew Xie

core/java/android/server/BluetoothService.java

@@ -530,7 +530,7 @@ public boolean enableNoAutoConnect() {
         // Bluetooth stack needs a small delay here before adding
         // SDP records, otherwise dbus stalls for over 30 seconds 1 out of 50 runs
         try {
-            Thread.sleep(20);
+            Thread.sleep(50);
         } catch (InterruptedException e) {}
         updateSdpRecords();
         return true;
@@ -602,7 +602,7 @@ private synchronized void updateSdpRecords() {
         // Bluetooth stack need some a small delay here before adding more
         // SDP records, otherwise dbus stalls for over 30 seconds 1 out of 50 runs
         try {
-            Thread.sleep(20);
+            Thread.sleep(50);
         } catch (InterruptedException e) {}
 
         if (R.getBoolean(com.android.internal.R.bool.config_bluetooth_default_profiles)) {