commit e3f81ed09ea1f683f0294511791876527ec00926
author Linux Build Service Account <lnxbuild@localhost> Tue Sep 09 00:57:27 2014 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Sep 09 00:57:27 2014 -0700
tree f0479f288605d2f0295873c6c540626e8e2fed4a
parent 4495c359ec525b6335353c31f97970ccad851ff6
parent 2cf2c235a642bfd716a91bb4ecf503fad3d81f9c

Merge "Bluetooth-Wipower: Cleanup activity for wipower on disconnect."

src/org/codeaurora/bluetooth/a4wp/A4wpService.java

diff --git a/src/org/codeaurora/bluetooth/a4wp/A4wpService.java b/src/org/codeaurora/bluetooth/a4wp/A4wpService.java
index 85e8e0b..3b55e23 100644
--- a/src/org/codeaurora/bluetooth/a4wp/A4wpService.java
+++ b/src/org/codeaurora/bluetooth/a4wp/A4wpService.java
@@ -571,8 +571,10 @@
     private final BluetoothGattServerCallback mGattCallbacks = new BluetoothGattServerCallback() {
         @Override
         public void onConnectionStateChange(BluetoothDevice device, int status, int newState) {
+            WipowerState state = WipowerState.OFF;
             mState = newState;
-            if (mState == BluetoothProfile.STATE_DISCONNECTED) {
+            state = mWipowerManager.getState();
+            if ((mState == BluetoothProfile.STATE_DISCONNECTED) && state == WipowerState.ON) {
                 Log.v(LOGTAG, "onConnectionStateChange:DISCONNECTED " + device + "charge complete " + mChargeComplete);
                 if (mDevice != null && mWipowerManager != null) {
                     mWipowerManager.enableDataNotification(false);