Merge "Bluetooh-Wipower: Fix for delayed advertisments."

1 files changed, 41 insertions, 1 deletions

diff --git a/src/org/codeaurora/bluetooth/a4wp/A4wpService.java b/src/org/codeaurora/bluetooth/a4wp/A4wpService.java
index e766fdc..b62f740 100644
--- a/src/org/codeaurora/bluetooth/a4wp/A4wpService.java
+++ b/src/org/codeaurora/bluetooth/a4wp/A4wpService.java
@@ -59,6 +59,10 @@ import android.wipower.WipowerManager.PowerLevel;
 import android.wipower.WipowerDynamicParam;
 import com.quicinc.wbc.WbcManager;
 import com.quicinc.wbc.WbcTypes;
+import android.os.Handler;
+import android.os.HandlerThread;
+import android.os.Looper;
+import android.os.Message;
 
 import android.bluetooth.le.AdvertiseCallback;
 import android.bluetooth.le.AdvertiseSettings;
@@ -80,6 +84,11 @@ public class A4wpService extends Service
     private BluetoothDevice mDevice = null;
     private PowerManager.WakeLock mWakeLock = null;
 
+    // Advertising variables
+    private final static int START_ADVERTISING = 1;
+    private final static int STOP_ADVERTISING = 0;
+    private WipowerAdvHandler mHandler;
+
     private static final UUID A4WP_SERVICE_UUID = UUID.fromString("6455fffe-a146-11e2-9e96-0800200c9a67");
     //PRU writes
     private static final UUID A4WP_PRU_CTRL_UUID = UUID.fromString("6455e670-a146-11e2-9e96-0800200c9a67");
@@ -144,6 +153,25 @@ public class A4wpService extends Service
     private AdvertiseCallback mAdvertiseCallback = new myAdvertiseCallback(1);
     ParcelUuid uuid1 = ParcelUuid.fromString("6455fffe-a146-11e2-9e96-0800200c9a67");
 
+    // Handler to maintain advertisement messages
+    private final class WipowerAdvHandler extends Handler {
+        private WipowerAdvHandler(Looper looper) {
+            super(looper);
+        }
+
+       @Override
+        public void handleMessage(Message msg) {
+           switch (msg.what) {
+               case START_ADVERTISING:
+                   StartAdvertising();
+                   break;
+               case STOP_ADVERTISING:
+                   stopAdvertising();
+                   break;
+           }
+        }
+    }
+
     private WbcManager.WbcEventListener mWbcCallback = new WbcManager.WbcEventListener() {
 
         @Override
@@ -571,7 +599,9 @@ public class A4wpService extends Service
             Log.v(LOGTAG, "onPowerApply" + state);
             if (state == PowerApplyEvent.ON) {
                 Log.v(LOGTAG, "StartAdvertising");
-                StartAdvertising();
+                Message msg = mHandler.obtainMessage(START_ADVERTISING);
+                mHandler.sendMessage(msg);
+
             } else {
                 Log.v(LOGTAG, "Cancel connection as part of -" + state);
                 if (mBluetoothGattServer != null) {
@@ -892,6 +922,11 @@ public class A4wpService extends Service
             Log.v(LOGTAG, "onCreate: charge complete " + mChargeComplete);
             mWbcManager.register(mWbcCallback);
         }
+        // Starting a thread to handle the advertising
+        HandlerThread thread = new HandlerThread("WipowerAdvHandler");
+        thread.start();
+        Looper looper = thread.getLooper();
+        mHandler = new WipowerAdvHandler(looper);
     }
 
     @Override
@@ -905,6 +940,11 @@ public class A4wpService extends Service
             //release wake lock during BT-OFF.
             acquire_wake_lock(false);
         }
+        // Clear thread on destroy
+        Looper looper = mHandler.getLooper();
+        if (looper != null) {
+           looper.quit();
+        }
     }
 
     @Override