1. d630936 [automerger skipped] Merge "Use memcpy instead of casting to convert device_class to int" into oc-mr1-dev am: 88452a2e0d -s ours am: cd2d913f94 -s ours by Rahul Sabnis · 6 years ago
  2. 045f994 [automerger skipped] Merge "Use memcpy instead of casting to convert device_class to int" into pi-dev am: 2e2864e169 -s ours by Rahul Sabnis · 6 years ago
  3. b50e15f [automerger skipped] Merge "Use memcpy instead of casting to convert device_class to int" into oc-mr1-dev am: 88452a2e0d -s ours by Rahul Sabnis · 6 years ago
  4. bab739c [automerger skipped] Merge "Use memcpy instead of casting to convert device_class to int" into pi-dev by Rahul Sabnis · 6 years ago
  5. cd2d913 [automerger skipped] Merge "Use memcpy instead of casting to convert device_class to int" into oc-mr1-dev by Rahul Sabnis · 6 years ago
  6. 88452a2 Merge "Use memcpy instead of casting to convert device_class to int" into oc-mr1-dev by TreeHugger Robot · 6 years ago
  7. 2e2864e Merge "Use memcpy instead of casting to convert device_class to int" into pi-dev by TreeHugger Robot · 6 years ago
  8. 4256548 Merge "Use memcpy instead of casting to convert device_class to int" into qt-dev by Rahul Sabnis · 6 years ago
  9. 69ee68f Merge "Use memcpy instead of casting to convert device_class to int" into qt-dev by TreeHugger Robot · 6 years ago
  10. 5771119 SDP: Disconnect when there is a bad length am: 7f555a1a9b am: 325d1539ba am: 23bcf92253 am: 736669e4a5 by Zongheng Wang · 6 years ago
  11. b0b1920 SDP: disconnect if sdp_copy_raw_data fails am: 41939a2b5a am: e6bda7c73b am: ae973c7782 am: 2dc8860396 by Zongheng Wang · 6 years ago
  12. 4a8fc77 SDP: Disconnect when there is a bad length am: 7f555a1a9b am: 325d1539ba am: 23bcf92253 by Zongheng Wang · 6 years ago
  13. 5d03b9c SDP: disconnect if sdp_copy_raw_data fails am: 41939a2b5a am: e6bda7c73b am: ae973c7782 by Zongheng Wang · 6 years ago
  14. 736669e SDP: Disconnect when there is a bad length am: 7f555a1a9b am: 325d1539ba by Zongheng Wang · 6 years ago
  15. 2dc8860 SDP: disconnect if sdp_copy_raw_data fails am: 41939a2b5a am: e6bda7c73b by Zongheng Wang · 6 years ago
  16. 23bcf92 SDP: Disconnect when there is a bad length am: 7f555a1a9b am: 325d1539ba by Zongheng Wang · 6 years ago
  17. ae973c7 SDP: disconnect if sdp_copy_raw_data fails am: 41939a2b5a am: e6bda7c73b by Zongheng Wang · 6 years ago
  18. 325d153 SDP: Disconnect when there is a bad length am: 7f555a1a9b by Zongheng Wang · 6 years ago
  19. e6bda7c SDP: disconnect if sdp_copy_raw_data fails am: 41939a2b5a by Zongheng Wang · 6 years ago
  20. 7f555a1 SDP: Disconnect when there is a bad length by Zongheng Wang · 6 years ago
  21. 4b881cf Fix potential OOB read in sdpu_get_len_from_type am: fa800d23fa am: 9f26f5c19b am: e85a439780 by Ted Wang · 6 years ago
  22. d07c7f1 Fix potential OOB read in sdpu_get_len_from_type am: fa800d23fa am: 9f26f5c19b by Ted Wang · 6 years ago
  23. e85a439 Fix potential OOB read in sdpu_get_len_from_type am: fa800d23fa am: 9f26f5c19b by Ted Wang · 6 years ago
  24. 9f26f5c Fix potential OOB read in sdpu_get_len_from_type am: fa800d23fa by Ted Wang · 6 years ago
  25. fa800d2 Fix potential OOB read in sdpu_get_len_from_type by Ted Wang · 6 years ago
  26. fe9eb18 [automerger skipped] DO NOT MERGE: SDP: Check p_end in save_attr_seq and add_attr am: 4291c84baa -s ours am: 2b28faafa0 -s ours am: a03b3585db -s ours by Myles Watson · 6 years ago
  27. 44ec263 [automerger skipped] DO NOT MERGE: SDP: Check p_end in save_attr_seq and add_attr am: 4291c84baa -s ours am: 2b28faafa0 -s ours by Myles Watson · 6 years ago
  28. a03b358 [automerger skipped] DO NOT MERGE: SDP: Check p_end in save_attr_seq and add_attr am: 4291c84baa -s ours by Myles Watson · 6 years ago
  29. 2b28faa [automerger skipped] DO NOT MERGE: SDP: Check p_end in save_attr_seq and add_attr by Myles Watson · 6 years ago
  30. 4291c84 DO NOT MERGE: SDP: Check p_end in save_attr_seq and add_attr by Myles Watson · 7 years ago
  31. 969ebed Use memcpy instead of casting to convert device_class to int by Rahul Sabnis · 6 years ago
  32. ecf8f75 Use memcpy instead of casting to convert device_class to int by Rahul Sabnis · 6 years ago
  33. 50bf4cf Use memcpy instead of casting to convert device_class to int by Rahul Sabnis · 6 years ago
  34. 41939a2 SDP: disconnect if sdp_copy_raw_data fails by Zongheng Wang · 6 years ago
  35. 5c3e64a [automerger skipped] resolve merge conflicts of 098e2972201b454de0f95a72636ecd9009dc32de to oc-dr1-dev am: 9bc574c618 -s ours am: db61bc8978 -s ours am: 40ac062848 -s ours by Ugo Yu · 6 years ago
  36. ee56071 [automerger skipped] resolve merge conflicts of 098e2972201b454de0f95a72636ecd9009dc32de to oc-dr1-dev am: 9bc574c618 -s ours am: db61bc8978 -s ours by Ugo Yu · 6 years ago
  37. 40ac062 [automerger skipped] resolve merge conflicts of 098e2972201b454de0f95a72636ecd9009dc32de to oc-dr1-dev am: 9bc574c618 -s ours by Ugo Yu · 6 years ago
  38. db61bc8 [automerger skipped] resolve merge conflicts of 098e2972201b454de0f95a72636ecd9009dc32de to oc-dr1-dev by Ugo Yu · 6 years ago
  39. 9bc574c resolve merge conflicts of 098e2972201b454de0f95a72636ecd9009dc32de to oc-dr1-dev by Ugo Yu · 6 years ago
  40. f77868a [automerger skipped] Merge "Store BLE keys using the address from the ble_auth_cmpl_evt" into qt-dev by Ugo Yu · 6 years ago
  41. a9b50ae Merge "Store BLE keys using the address from the ble_auth_cmpl_evt" into qt-dev by TreeHugger Robot · 6 years ago
  42. 623c1f0 [automerger skipped] DO NOT MERGE Store BLE keys using the address from the ble_auth_cmpl_evt am: a65f859b17 -s ours am: 441b011410 -s ours by Ugo Yu · 6 years ago
  43. b1f32a5 [automerger skipped] DO NOT MERGE Store BLE keys using the address from the ble_auth_cmpl_evt am: a65f859b17 -s ours by Ugo Yu · 6 years ago
  44. 61fcafa [automerger skipped] DO NOT MERGE Store BLE keys using the address from the ble_auth_cmpl_evt am: b2334f0589 -s ours by Ugo Yu · 6 years ago
  45. 441b011 [automerger skipped] DO NOT MERGE Store BLE keys using the address from the ble_auth_cmpl_evt by Ugo Yu · 6 years ago
  46. 10a884f [automerger skipped] DO NOT MERGE Store BLE keys using the address from the ble_auth_cmpl_evt by Ugo Yu · 6 years ago
  47. 22711f1 Store BLE keys using the address from the ble_auth_cmpl_evt by Ugo Yu · 6 years ago
  48. 311ebce Store BLE keys using the address from the ble_auth_cmpl_evt by Ugo Yu · 6 years ago
  49. 098e297 DO NOT MERGE Store BLE keys using the address from the ble_auth_cmpl_evt by Ugo Yu · 6 years ago
  50. a65f859 DO NOT MERGE Store BLE keys using the address from the ble_auth_cmpl_evt by Ugo Yu · 6 years ago
  51. b2334f0 DO NOT MERGE Store BLE keys using the address from the ble_auth_cmpl_evt by Ugo Yu · 6 years ago
  52. 8302b14 Switch Nintendo workaround to match by name am: c14c14fbc4 by Andre Eisenbach · 6 years ago
  53. 34a08c8 Match Nintento Pro Controller by name for interop am: b71ebf2d82 by Andre Eisenbach · 6 years ago
  54. a2bb603 Hearing Aid: set BLE phy to 2M if local and peer indicate PHY 2M support by weichinweng · 6 years ago
  55. c14c14f Switch Nintendo workaround to match by name by Andre Eisenbach · 6 years ago
  56. b71ebf2 Match Nintento Pro Controller by name for interop by Andre Eisenbach · 6 years ago
  57. 11ec2ad RootCanal: Set the timer period to 1 second am: eb9a775086 by Myles Watson · 6 years ago
  58. eb9a775 RootCanal: Set the timer period to 1 second by Myles Watson · 6 years ago
  59. 3ed3319 Merge "RootCanal: Make beacons less verbose" into qt-dev am: 155a2373f3 by Myles Watson · 6 years ago
  60. 155a237 Merge "RootCanal: Make beacons less verbose" into qt-dev by TreeHugger Robot · 6 years ago
  61. 80f277f RootCanal: Make beacons less verbose by Myles Watson · 6 years ago
  62. 0dc155f DO NOT MERGE RootCanal: Always add default devices am: 6160b51adc by Myles Watson · 6 years ago
  63. 6160b51 DO NOT MERGE RootCanal: Always add default devices by Myles Watson · 6 years ago
  64. 3969e6d Revert "libprocessgroup users use libcutils" am: 0c4d5997a4 by Zhijun He · 6 years ago
  65. 0c4d599 Revert "libprocessgroup users use libcutils" by Zhijun He · 6 years ago
  66. 4d0c625 Limit sniff mode for Nintendo Pro Controller to 11.25ms am: 85d56a8d38 by Andre Eisenbach · 6 years ago
  67. 437baa7 Merge "Revert "DO NOT MERGE: btif: require pairing dialog for JustWorks SSP"" into qt-dev by Martin Brabham · 6 years ago
  68. 6691266 Revert "DO NOT MERGE: btif: require pairing dialog for JustWorks SSP" by Martin Brabham · 6 years ago
  69. 85d56a8 Limit sniff mode for Nintendo Pro Controller to 11.25ms by Andre Eisenbach · 6 years ago
  70. 1d0646a Merge "Revert "DO NOT MERGE: btif: require pairing dialog for JustWorks SSP"" into qt-dev by TreeHugger Robot · 6 years ago
  71. 19d8c6e Revert "DO NOT MERGE: btif: require pairing dialog for JustWorks SSP" by Martin Brabham · 6 years ago
  72. 01358b6 libprocessgroup users use libcutils am: 93e1622ba6 by Steven Moreland · 6 years ago
  73. 93e1622 libprocessgroup users use libcutils by Steven Moreland · 6 years ago
  74. 03306c5 Fix for BluetoothGattCallback.onConnectionStateChange being called more than once by Jakub Pawlowski · 6 years ago
  75. 9818641 Fix for BluetoothGattCallback.onConnectionStateChange being called more than once by Jakub Pawlowski · 6 years ago
  76. 94b4587 Load gatt_database if it is empty in bta_gattc_process_indicate am: d8cdc6c2b8 by weichinweng · 6 years ago
  77. d8cdc6c Load gatt_database if it is empty in bta_gattc_process_indicate by weichinweng · 6 years ago
  78. e05ea5e Revert "Open connection if it doesn't exsist in bta_gattc_process_indicate" by Jakub Pawlowski · 6 years ago
  79. 1ae89b7 Revert "Open connection if it doesn't exsist in bta_gattc_process_indicate" by Jakub Pawlowski · 6 years ago
  80. fac802a Confirm the presence of BT key when BT ON am: bd8c5865c9 by Martin Brabham · 6 years ago
  81. bd8c586 Confirm the presence of BT key when BT ON by Martin Brabham · 6 years ago
  82. 97a5d60 [automerger skipped] Merge changes from topic "am-e3f94184-0df3-403b-b2dc-4ebd50beee32" into oc-dev am: 38535adcd0 -s ours am: 28a8e8b848 -s ours am: c5837d3d81 -s ours am: 5b7daae369 -s ours by Jakub Pawlowski · 6 years ago
  83. 811fb56 [automerger skipped] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size am: 461f0b4739 -s ours am: 35f2cb15f1 -s ours am: 75384547fb -s ours am: dd59bd4400 -s ours by Jakub Pawlowski · 6 years ago
  84. 4ea1ac1 [automerger skipped] Merge changes from topic "am-e3f94184-0df3-403b-b2dc-4ebd50beee32" into oc-dev am: 38535adcd0 -s ours am: 28a8e8b848 -s ours am: c5837d3d81 -s ours by Jakub Pawlowski · 6 years ago
  85. 82398ca [automerger skipped] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size am: 461f0b4739 -s ours am: 35f2cb15f1 -s ours am: 75384547fb -s ours by Jakub Pawlowski · 6 years ago
  86. 5b7daae [automerger skipped] Merge changes from topic "am-e3f94184-0df3-403b-b2dc-4ebd50beee32" into oc-dev am: 38535adcd0 -s ours am: 28a8e8b848 -s ours by Jakub Pawlowski · 6 years ago
  87. dd59bd4 [automerger skipped] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size am: 461f0b4739 -s ours am: 35f2cb15f1 -s ours by Jakub Pawlowski · 6 years ago
  88. c5837d3 [automerger skipped] Merge changes from topic "am-e3f94184-0df3-403b-b2dc-4ebd50beee32" into oc-dev am: 38535adcd0 -s ours by Jakub Pawlowski · 6 years ago
  89. 7538454 [automerger skipped] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size am: 461f0b4739 -s ours by Jakub Pawlowski · 6 years ago
  90. 28a8e8b [automerger skipped] Merge changes from topic "am-e3f94184-0df3-403b-b2dc-4ebd50beee32" into oc-dev by Jakub Pawlowski · 6 years ago
  91. 35f2cb1 [automerger skipped] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size by Jakub Pawlowski · 6 years ago
  92. 38535ad Merge changes from topic "am-e3f94184-0df3-403b-b2dc-4ebd50beee32" into oc-dev by Jakub Pawlowski · 6 years ago
  93. 3ad01f1 [automerger skipped] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size am: bdac7b911f -s ours am: 35f034bb61 -s ours by Jakub Pawlowski · 6 years ago
  94. 7462717 [automerger skipped] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size am: c978f86b50 -s ours by Jakub Pawlowski · 6 years ago
  95. 49d1907 Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size by Jakub Pawlowski · 6 years ago
  96. 04d073c [automerger skipped] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size am: bdac7b911f -s ours by Jakub Pawlowski · 6 years ago
  97. 332964b [automerger skipped] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size by Jakub Pawlowski · 6 years ago
  98. 35f034b [automerger skipped] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size by Jakub Pawlowski · 6 years ago
  99. 42d7c82 [automerger] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size am: c5aa5feebf am: 0a76ef0245 am: 20649305ba am: 20f1cf2b81 skipped: cb880ad379 by Android Build Merger (Role) · 6 years ago
  100. cb880ad [automerger] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size am: c5aa5feebf am: 0a76ef0245 am: 20649305ba am: 20f1cf2b81 by Android Build Merger (Role) · 6 years ago