Merge "Add more information for bond and acl state change"HEADandroid-s-beta-5masterandroid-s-beta-5

3 files changed, 16 insertions, 12 deletions

diff --git a/src/com/android/bluetooth/btservice/BondStateMachine.java b/src/com/android/bluetooth/btservice/BondStateMachine.java
index ce599a086..30d2d0a4b 100644
--- a/src/com/android/bluetooth/btservice/BondStateMachine.java
+++ b/src/com/android/bluetooth/btservice/BondStateMachine.java
@@ -426,7 +426,7 @@ final class BondStateMachine extends StateMachine {
                 + state2str(newState));
     }
 
-    void bondStateChangeCallback(int status, byte[] address, int newState) {
+    void bondStateChangeCallback(int status, byte[] address, int newState, int hciReason) {
         BluetoothDevice device = mRemoteDevices.getDevice(address);
 
         if (device == null) {
@@ -437,7 +437,7 @@ final class BondStateMachine extends StateMachine {
         }
 
         infoLog("bondStateChangeCallback: Status: " + status + " Address: " + device + " newState: "
-                + newState);
+                + newState + " hciReason: " + hciReason);
 
         Message msg = obtainMessage(BONDING_STATE_CHANGE);
         msg.obj = device;
diff --git a/src/com/android/bluetooth/btservice/JniCallbacks.java b/src/com/android/bluetooth/btservice/JniCallbacks.java
index 231751ee2..f00353ad9 100644
--- a/src/com/android/bluetooth/btservice/JniCallbacks.java
+++ b/src/com/android/bluetooth/btservice/JniCallbacks.java
@@ -63,12 +63,14 @@ final class JniCallbacks {
         mBondStateMachine.pinRequestCallback(address, name, cod, min16Digits);
     }
 
-    void bondStateChangeCallback(int status, byte[] address, int newState) {
-        mBondStateMachine.bondStateChangeCallback(status, address, newState);
+    void bondStateChangeCallback(int status, byte[] address, int newState, int hciReason) {
+        mBondStateMachine.bondStateChangeCallback(status, address, newState, hciReason);
     }
 
-    void aclStateChangeCallback(int status, byte[] address, int newState, int hciReason) {
-        mRemoteDevices.aclStateChangeCallback(status, address, newState, hciReason);
+    void aclStateChangeCallback(int status, byte[] address, int newState,
+            int transportLinkType, int hciReason) {
+        mRemoteDevices.aclStateChangeCallback(status, address, newState,
+                transportLinkType, hciReason);
     }
 
     void stateChangeCallback(int status) {
diff --git a/src/com/android/bluetooth/btservice/RemoteDevices.java b/src/com/android/bluetooth/btservice/RemoteDevices.java
index 3029ada67..2157fbc86 100644
--- a/src/com/android/bluetooth/btservice/RemoteDevices.java
+++ b/src/com/android/bluetooth/btservice/RemoteDevices.java
@@ -608,7 +608,8 @@ final class RemoteDevices {
         }
     }
 
-    void aclStateChangeCallback(int status, byte[] address, int newState, int hciReason) {
+    void aclStateChangeCallback(int status, byte[] address, int newState,
+                                int transportLinkType, int hciReason) {
         BluetoothDevice device = getDevice(address);
 
         if (device == null) {
@@ -649,7 +650,9 @@ final class RemoteDevices {
             }
             debugLog(
                     "aclStateChangeCallback: Adapter State: " + BluetoothAdapter.nameForState(state)
-                            + " Disconnected: " + device);
+                            + " Disconnected: " + device
+                            + " transportLinkType: " + transportLinkType
+                            + " hciReason: " + hciReason);
         }
 
         int connectionState = newState == AbstractionLayer.BT_ACL_STATE_CONNECTED
@@ -663,10 +666,9 @@ final class RemoteDevices {
                 sAdapterService.obfuscateAddress(device), classOfDevice, metricId);
 
         if (intent != null) {
-            intent.putExtra(BluetoothDevice.EXTRA_DEVICE, device);
-            intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT
-                    | Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND);
-            intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT);
+            intent.putExtra(BluetoothDevice.EXTRA_DEVICE, device)
+                .addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT)
+                .addFlags(Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND);
             sAdapterService.sendBroadcast(intent, sAdapterService.BLUETOOTH_PERM);
 
             synchronized (sAdapterService.getBluetoothConnectionCallbacks()) {