Bluetooth: Integrates LPP changes into pxp monitor servcie

This removes extra gatt connections for same device,adds LPP
callback handlers for each device as part of pxp service.
pxp service also includes RSSI monitor callback.

Change-Id: Ia5bd864282c8ea99664e5feb6184c7de998e9a5e
CRs-Fixed: 657495

3 files changed, 7 insertions, 11 deletions

diff --git a/pxp-monitor/src/org/codeaurora/bluetooth/pxpmonitor/DeviceActivity.java b/pxp-monitor/src/org/codeaurora/bluetooth/pxpmonitor/DeviceActivity.java
index ab12551..98163fa 100644
--- a/pxp-monitor/src/org/codeaurora/bluetooth/pxpmonitor/DeviceActivity.java
+++ b/pxp-monitor/src/org/codeaurora/bluetooth/pxpmonitor/DeviceActivity.java
@@ -281,18 +281,11 @@ public class DeviceActivity extends Activity {
             mLinkRingtone.stop();
         }
 
-        mLinkRingtone = null;
-        mLinkNotification = null;
-
         if (mPathRingtone.isPlaying()) {
             mPathRingtone.stop();
         }
 
-        mPathRingtone = null;
-        mPathNotification = null;
-
         unbindService(mConnection);
-        mPxpServiceProxy = null;
     }
 
     @Override
diff --git a/pxp-monitor/src/org/codeaurora/bluetooth/pxpmonitor/MainActivity.java b/pxp-monitor/src/org/codeaurora/bluetooth/pxpmonitor/MainActivity.java
index 0bb7f6f..3d88c3e 100644
--- a/pxp-monitor/src/org/codeaurora/bluetooth/pxpmonitor/MainActivity.java
+++ b/pxp-monitor/src/org/codeaurora/bluetooth/pxpmonitor/MainActivity.java
@@ -139,10 +139,11 @@ public class MainActivity extends Activity implements ConnectToDeviceDialogListe
     protected void onDestroy() {
 
         Log.v(TAG, "onDestroy ");
-
-        unbindService(mConnection);
-        mPxpServiceProxy = null;
-        super.onDestroy();
+        if(mConnection != null ) {
+            unbindService(mConnection);
+            mPxpServiceProxy = null;
+            super.onDestroy();
+       }
     }
 
     @Override
diff --git a/pxp-monitor/src/org/codeaurora/bluetooth/pxpmonitor/PxpServiceProxy.java b/pxp-monitor/src/org/codeaurora/bluetooth/pxpmonitor/PxpServiceProxy.java
index 3864ca2..256709d 100644
--- a/pxp-monitor/src/org/codeaurora/bluetooth/pxpmonitor/PxpServiceProxy.java
+++ b/pxp-monitor/src/org/codeaurora/bluetooth/pxpmonitor/PxpServiceProxy.java
@@ -157,6 +157,7 @@ public class PxpServiceProxy extends Service {
     public void onDestroy() {
         Log.d(TAG, "onDestroy");
         super.onDestroy();
+        mHandler = null;
         unregisterReceiver(mDataReceiver);
     }
 
@@ -169,6 +170,7 @@ public class PxpServiceProxy extends Service {
     @Override
     public boolean onUnbind(Intent intent) {
         Log.v(TAG, "onUnbind()");
+        mHandler = null;
         return super.onUnbind(intent);
     }