1 files changed, 9 insertions, 3 deletions
diff --git a/src/com/android/bluetooth/btservice/JniCallbacks.java b/src/com/android/bluetooth/btservice/JniCallbacks.java
index d9feb6fd4..109db55fd 100644
--- a/src/com/android/bluetooth/btservice/JniCallbacks.java
+++ b/src/com/android/bluetooth/btservice/JniCallbacks.java
@@ -12,7 +12,7 @@ final class JniCallbacks {
     private AdapterState mAdapterStateMachine;
     private BondStateMachine mBondStateMachine;
 
-    JniCallbacks(RemoteDevices remoteDevices, AdapterProperties adapterProperties,
+    private JniCallbacks(RemoteDevices remoteDevices, AdapterProperties adapterProperties,
             AdapterState adapterStateMachine, BondStateMachine bondStateMachine) {
         mRemoteDevices = remoteDevices;
         mAdapterProperties = adapterProperties;
@@ -23,12 +23,18 @@ final class JniCallbacks {
     static synchronized JniCallbacks getInstance(RemoteDevices remoteDevices,
             AdapterProperties adapterProperties, AdapterState adapterStateMachine,
             BondStateMachine bondStateMachine) {
-        if (sInstance == null) sInstance =
+        if (sInstance == null)  {
+            sInstance =
                 new JniCallbacks(remoteDevices, adapterProperties, adapterStateMachine,
                         bondStateMachine);
+        } else {
+            sInstance.mRemoteDevices = remoteDevices;
+            sInstance.mAdapterProperties = adapterProperties;
+            sInstance.mAdapterStateMachine = adapterStateMachine;
+            sInstance.mBondStateMachine = bondStateMachine;
+        }
         return sInstance;
     }
-
     public Object Clone() throws CloneNotSupportedException {
         throw new CloneNotSupportedException();
     }