summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2015-01-24 10:10:11 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2015-01-24 10:10:11 -0800
commit29cf1efcc23f180201c8b33d0c69538076cc7a7e (patch)
treeb0188252a8afe62fdcebe0a5f334e290f1ec8ff5
parentddcd0caf30f4565e472204a6c492caae1edbc80d (diff)
parent1564fa0f9253b03aa64a5c24960311ab868e6c8a (diff)
downloadandroid_packages_apps_BluetoothExt-29cf1efcc23f180201c8b33d0c69538076cc7a7e.tar.gz
android_packages_apps_BluetoothExt-29cf1efcc23f180201c8b33d0c69538076cc7a7e.tar.bz2
android_packages_apps_BluetoothExt-29cf1efcc23f180201c8b33d0c69538076cc7a7e.zip
Merge "Bluetooth-Wipower: Fix for BLE GATT Server disconnection failure."
-rw-r--r--src/org/codeaurora/bluetooth/a4wp/A4wpService.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/org/codeaurora/bluetooth/a4wp/A4wpService.java b/src/org/codeaurora/bluetooth/a4wp/A4wpService.java
index fa69330..ae43436 100644
--- a/src/org/codeaurora/bluetooth/a4wp/A4wpService.java
+++ b/src/org/codeaurora/bluetooth/a4wp/A4wpService.java
@@ -703,9 +703,6 @@ public class A4wpService extends Service
isChargePortSet = false;
} else if (mState == BluetoothProfile.STATE_CONNECTED) {
Log.v(LOGTAG, "onConnectionStateChange:CONNECTED");
- /* Initiate a dummy connection such that on stop advertisment
- the advetisment instances are cleared properly */
- mBluetoothGattServer.connect(device, false);
}
}
@@ -776,6 +773,9 @@ public class A4wpService extends Service
{
value = mPruStaticParam.getValue();
mDevice = device;
+ /* Initiate a dummy connection such that on stop advertisment
+ the advetisment instances are cleared properly */
+ mBluetoothGattServer.connect(mDevice, false);
}
else if (id == A4WP_PRU_DYNAMIC_UUID) {
if (mPruDynamicParam == null) {
@@ -859,8 +859,8 @@ public class A4wpService extends Service
.addServiceData(uuid1, serviceData).build();
mAdvertiseSettings = new AdvertiseSettings.Builder()
- .setAdvertiseMode(AdvertiseSettings.ADVERTISE_MODE_LOW_POWER)
- .setTxPowerLevel(AdvertiseSettings.ADVERTISE_TX_POWER_ULTRA_LOW)
+ .setAdvertiseMode(AdvertiseSettings.ADVERTISE_MODE_LOW_LATENCY)
+ .setTxPowerLevel(AdvertiseSettings.ADVERTISE_TX_POWER_HIGH)
.setConnectable(true)
.setTimeout(WIPOWER_ADV_TIMEOUT).build();