OSDN Git Service
Chao Quan [Thu, 14 Dec 2017 19:54:35 +0000 (19:54 +0000)]
Fix GATT discovery service fail over BR/EDR
am:
b00872797a
Change-Id: Ib2b8a7cfe8757942a1eb25dd14c298a15809d5c5
Chao Quan [Mon, 23 Oct 2017 11:41:13 +0000 (19:41 +0800)]
Fix GATT discovery service fail over BR/EDR
According to the current gattc state machine, stack queues
discovery services request comes from framework when gattc
is in BTA_GATTC_DISCOVER_ST state. This request is re-scheduled
after discovery on server finished in bta_gattc_disc_cmpl
and return the discovery results to framemwork. But now, stack
assumed LE transport in code, which prevents discovery services
executing. This error can be detected by ACTS GATTOverBrEdrTest:
test_gatt_bredr_connect_trigger_on_services_discovered
Fix assumed transport to actual situantion
Test: ACTS GATTOverBrEdrTest:
test_gatt_bredr_connect_trigger_on_services_discovered
Change-Id: I110a0a3c19595fb76c3bb15b092ce18ebf7b11bf
Jack He [Thu, 14 Dec 2017 00:18:36 +0000 (00:18 +0000)]
HFP: Fix static check errors
am:
6545d3f346
Change-Id: I94c8a817b847f7a4136d5c150db6044c55188893
Jack He [Tue, 12 Dec 2017 03:49:30 +0000 (19:49 -0800)]
HFP: Fix static check errors
* In bta/ag and btif/btif_hf.cc
* Simplify boolean values
* Use nullptr intead of NULL
* Use C++ style include headers instead of C style ones
* Remove unused struct definitions
* Remove unused code from bta_ag_ci.h/cc
* Use range based for-loop when it can be converted automatically
* Use C++ style zero-initialization instead of memset so that non-POD
members of structs can be initialized properly
* Use "" to initliaze char array since the rest of the array will be
zero padded if the array is assigned to a shorter string than its
length
Bug:
68340193
Test: make, connect to HFP enabled device
Change-Id: I25c1e48ca1cb40629b9b60243ec462f498d8fc24
Jakub Pawlowski [Wed, 13 Dec 2017 21:58:44 +0000 (21:58 +0000)]
Merge "Bump GATT cache file version marker"
am:
4edb5857bc
Change-Id: Ie2636872c56069c558e236fda9877d2be5d049cc
Treehugger Robot [Wed, 13 Dec 2017 21:54:02 +0000 (21:54 +0000)]
Merge "Bump GATT cache file version marker"
Jakub Pawlowski [Wed, 13 Dec 2017 18:02:32 +0000 (10:02 -0800)]
Bump GATT cache file version marker
In commit
819e2ecb84, the type used for UUID in the GATT cache was changed
from tBT_UUID to bluetooth:Uuid. This changed the binary representation of
this field. 18 bytes were used previously, now only 16 bytes are used.
This change made GATT cache file format incompatible between Android
versions, and requires an increment of cache file format version.
Fixes:
70297056
Test: added GattCacheTest
Change-Id: I4bceada300dbe3aab10d14df2aa853e4573c536e
Vishwath Mohan [Wed, 13 Dec 2017 21:05:02 +0000 (21:05 +0000)]
Merge "Fix callback type mismatches in Bluetooth"
am:
f527f08e4f
Change-Id: I8963109fe921b84fcfa31f096a26ffd420af182a
Matadeen Mishra [Wed, 13 Dec 2017 21:04:37 +0000 (21:04 +0000)]
Added check to know the status of any ongoing pairing status.
am:
6cc4234169
Change-Id: If0868cfe6d496027199f040ba72175a603353776
Vishwath Mohan [Wed, 13 Dec 2017 21:00:31 +0000 (21:00 +0000)]
Merge "Fix callback type mismatches in Bluetooth"
Matadeen Mishra [Tue, 21 Jun 2016 12:27:31 +0000 (17:57 +0530)]
Added check to know the status of any ongoing pairing status.
Use Case: Host allows incoming pairing even though outgoing pairing
is in process.
Steps:
1. Initiate bonding from Mecapp and provide pin key at Mecapp pairing
pop-up.
2. Start pairing for Logitech mouse from DUT and click on accept
pairing at mecapp pairing pop-up.
3. Give the same pin key for mecapp pairing pop-up at DUT side and
observe the behavior.
Failure: Incoming request is getting from remote and got a pop-up
for PIN request.
Root Cause: Pairing was auto accepted for remote device while
pairing was in progress with another remote device leading to
inconsistent behavior.
Fix: Rejects incoming pairing request from remote device
if already in pairing state.
Test: Tested with HID Logitech Mouse
Fixes:
35417665
Change-Id: I19a2a98e4ceb51cabaef279a2e3f8224fbed9ea1
Vishwath Mohan [Mon, 4 Dec 2017 21:28:06 +0000 (13:28 -0800)]
Fix callback type mismatches in Bluetooth
This CL fixes some mismatches between defined callback signatures and
the signatures of the functions that are actually passed in as that
type.
Bug:
67507323
Test: lunch walleye_cfi && m -j50
Change-Id: Ia5c22ac614c34cc8bd8a370861d988bb9f8034a6
Hemant Gupta [Wed, 13 Dec 2017 01:58:11 +0000 (01:58 +0000)]
Merge "BLE: Don't set SC bit in AuthReq for Legacy Devices"
am:
9d4686bd2f
Change-Id: I8613157bff638cef511af4b29cf0adc5902a7911
Satish Kodishala [Wed, 13 Dec 2017 01:57:44 +0000 (01:57 +0000)]
Merge "Check MT call setup state before starting ring timer"
am:
964542b8e6
Change-Id: I9e2be9fba8c802e933ea853dc0130d8271ba252f
Treehugger Robot [Wed, 13 Dec 2017 01:21:23 +0000 (01:21 +0000)]
Merge "BLE: Don't set SC bit in AuthReq for Legacy Devices"
Treehugger Robot [Wed, 13 Dec 2017 00:31:35 +0000 (00:31 +0000)]
Merge "Check MT call setup state before starting ring timer"
Hemant Gupta [Wed, 6 Dec 2017 10:05:20 +0000 (15:35 +0530)]
BLE: Don't set SC bit in AuthReq for Legacy Devices
Disable SC bit for legacy LE devices (< 4.2) since as per earlier
spec, this BIT should be 0 and ignored by remote device. Some remote
legacy devices which don't follow the approach of ignoring these bits
(if set) go in bad state and result in SMP pairing failure.
Test: Pairing succeeds with remote device after resettings SC bit.
Fixes:
70259025
Change-Id: I35838c60fb08916a141f764b3e1922d277b99f28
Myles Watson [Tue, 12 Dec 2017 19:46:49 +0000 (19:46 +0000)]
AVRCP: Flush the command queue in AVRC_Close
am:
a701c777af
Change-Id: I1fdbe972e912ca1a06e6b83e336080733a0b5cf1
Myles Watson [Tue, 12 Dec 2017 00:23:21 +0000 (16:23 -0800)]
AVRCP: Flush the command queue in AVRC_Close
Test: toggle BR/EDR, manually inspect open files using lsof
Change-Id: I7bdc3a3840e7cc31894a9050dd5b7c29f863bb30
Hansong Zhang [Tue, 12 Dec 2017 19:12:15 +0000 (19:12 +0000)]
Merge "Make BluetoothPbap implement BluetoothProfile (3/3)"
am:
eb9d2cff70
Change-Id: I3e129b74d7cb224754d35e0be01c1f73be361ea4
Treehugger Robot [Tue, 12 Dec 2017 19:02:26 +0000 (19:02 +0000)]
Merge "Make BluetoothPbap implement BluetoothProfile (3/3)"
Myles Watson [Sat, 9 Dec 2017 03:02:04 +0000 (03:02 +0000)]
binder: Call writeParcelFileDescriptor()
am:
be797989f1
Change-Id: I642871e90d7c3350a21f2b2641b6a1575c68a326
Myles Watson [Fri, 8 Dec 2017 23:50:49 +0000 (15:50 -0800)]
binder: Call writeParcelFileDescriptor()
Fixes:
69678755
Test: manual inspection using lsof
Change-Id: Ifcb5af2d5797e667c20d4c41ad836cf7626e9909
Hansong Zhang [Sat, 9 Dec 2017 00:08:34 +0000 (16:08 -0800)]
Make BluetoothPbap implement BluetoothProfile (3/3)
Change AIDL method signatures:
* Removed connect()
* Add BluetoothDevice parameter for disconnect()
* Rename other method names to be consistent with BluetoothProfile
methods
Test: test with PBAP carkits
Bug:
69417672
Change-Id: Ide81254d71128b9d204b63aa60bc39752add6edd
Jack He [Fri, 8 Dec 2017 01:37:44 +0000 (01:37 +0000)]
Merge "HFP: Remove dead code in native interface"
am:
2fbb2e982e
Change-Id: Id8a4f4b3446b77f4ea57b3af8e900c48065c3f45
Treehugger Robot [Fri, 8 Dec 2017 01:14:59 +0000 (01:14 +0000)]
Merge "HFP: Remove dead code in native interface"
Jakub Pawlowski [Thu, 7 Dec 2017 22:32:01 +0000 (22:32 +0000)]
Merge "Make LE CoC Maximum PDU Size configurable"
am:
bde88fa29c
Change-Id: I5a898bd5f71dcaf00674125ee25d6e80247660d1
Treehugger Robot [Thu, 7 Dec 2017 22:20:51 +0000 (22:20 +0000)]
Merge "Make LE CoC Maximum PDU Size configurable"
Jakub Pawlowski [Tue, 5 Dec 2017 07:17:49 +0000 (23:17 -0800)]
Make LE CoC Maximum PDU Size configurable
Hearing Aid will need to modify this value. For existing code keep the
value as is.
Test: none
Bug:
69623109
Change-Id: I8c97882b5dd08a049d3a958c51163bad41df4d6a
Jack He [Thu, 7 Dec 2017 20:34:30 +0000 (20:34 +0000)]
Merge "BTIF: Fix return types of interface getters"
am:
946ddd2770
Change-Id: I9121c1a99c593b2b27e15695121ed667f64008b8
Treehugger Robot [Thu, 7 Dec 2017 20:21:54 +0000 (20:21 +0000)]
Merge "BTIF: Fix return types of interface getters"
Jakub Pawlowski [Thu, 7 Dec 2017 20:13:22 +0000 (20:13 +0000)]
GATT cache memory corruption fix
am:
6918d40fd9
Change-Id: I7b5d4804d17675198c5995fa18faff74f0a2efae
Jack He [Thu, 7 Dec 2017 19:19:06 +0000 (11:19 -0800)]
HFP: Remove dead code in native interface
The following hidden API methods are not implemented by the stack and
should be removed:
- getBatteryUsageHint()
- acceptIncomingConnect()
- rejectIncomingConnect()
The following hidden API methods are no longer needed due to lack of
usage and should be removed:
- enableWBS()
- disableWBS()
- bindResponse()
Bug:
70336991
Test: make
Change-Id: Ifa0d3cbdf4487465782144b84a2bed5e4f7acc4e
Jakub Pawlowski [Tue, 5 Dec 2017 12:05:46 +0000 (04:05 -0800)]
GATT cache memory corruption fix
When doing GATT discovery, we interleave adding elements to vector,
and storing pointers to them. This can cause memory corruption, because
vector can reallocate the memory when adding element, leaving the pointers
invalid. To fix that, never store pointers to mutable vector elements.
Bug:
70041392
Test: manual, connected to HID device
Change-Id: I6bb3fec61afa742f446b66e3291c5f326738ee17
Jakub Pawlowski [Thu, 7 Dec 2017 18:22:40 +0000 (18:22 +0000)]
BTA GATT operation queue
am:
80c1e1c494
Change-Id: I771d06a5fb93f7a02a1cad8e70a158c2a523a5d0
Jakub Pawlowski [Thu, 30 Nov 2017 05:49:32 +0000 (21:49 -0800)]
BTA GATT operation queue
Currently, HID BTA app have own GATT queue for scheduling reads/writes
during device setup. Such queue will also be needed for Hearing Aid.
This patch makes the GATT queue code generic and clean it up.
Test: manual, bond HID device
Bug:
69623109
Change-Id: Ic893d630ab5154f7c1875748f3e275cbad02a7b2
Jack He [Mon, 4 Dec 2017 22:30:42 +0000 (14:30 -0800)]
BTIF: Fix return types of interface getters
* They should return const pointer to interface structs
* Fixed return type for btif_rc_ctrl_get_interface, it should be
"const btrc_ctrl_interface_t*" but was "btrc_interface_t*". Later
casting masked this error, but it may hurt us in the future if not
fixed
Test: make
Change-Id: I41b2366cce68b1338761d84cef9ab986fd3334df
Eagle Kang [Wed, 6 Dec 2017 21:04:38 +0000 (21:04 +0000)]
Merge "Log BT Trace levels per profile"
am:
792a202b39
Change-Id: If37fac010c209f8bab22a6a3837db019e142b3fa
Treehugger Robot [Wed, 6 Dec 2017 20:51:42 +0000 (20:51 +0000)]
Merge "Log BT Trace levels per profile"
Hansong Zhang [Wed, 6 Dec 2017 20:34:01 +0000 (20:34 +0000)]
Merge "Remove BluetoothHidDeviceAppConfiguration (1/4)"
am:
ad8c5197e2
Change-Id: If7ac469d6047883aa00efc267f9123b41205ddda
Treehugger Robot [Wed, 6 Dec 2017 19:34:22 +0000 (19:34 +0000)]
Merge "Remove BluetoothHidDeviceAppConfiguration (1/4)"
Venkata Jagadeesh Garaga [Wed, 6 Dec 2017 19:06:40 +0000 (19:06 +0000)]
Remove the remote from paired list when auth fails
am:
dae4076bcb
Change-Id: I5c0d47a55b13e2b4bf13678edcb45e01584d8cad
Venkata Jagadeesh Garaga [Sun, 30 Jul 2017 11:05:54 +0000 (16:35 +0530)]
Remove the remote from paired list when auth fails
Problem:
Remote stuck in connecting state during reconnection.
Steps:
1.Pair and connect the remote.
2.disconnect the remote and try to connect again from the DUT. In few trial authentication failure observed.
Root Cause:
During profile re connection scenario stack not posting
bond state change call back with bond none state if any
authentication failure. Any profile connection triggered
after this can stuck in security procedure and
never recovers.
Fix:
Hence remove the remote from paired list when auth fails
Test: manual
Bug:
69028610
Change-Id: I6ac627e733f8b0b191c600153542acbb07f8c7a8
Satish Kodishala [Wed, 13 Jan 2016 13:53:04 +0000 (19:23 +0530)]
Check MT call setup state before starting ring timer
Test: 1. Pair and connect to Bluetooth Headset.
2. Make an incoming call and accept it from phone or BT headset.
Failure:
User may hear ring although incoming call accepted.
Root cause:
There is a ring timer to send RING every 5 secs to connected
headset until the MT call is accepted. When the call is
accepted, we stop the ring timer and send call indicators.
In case, just at the same time the ring timer stopped and
call indicators sent, if ring timer expired, it will be started
again.
Fix:
Start the ring timer only if the call is not accepted yet.
Bug:
35415875
Change-Id: Ifbde9ac45ac406f46e418a8d20abff0fefe6d414
Eagle Kang [Thu, 13 Apr 2017 06:50:53 +0000 (14:50 +0800)]
Log BT Trace levels per profile
BT stack trace level load from bt_stack.conf.
This change help developer to know BT stack log level
when analyze main logs.
Test: manual
Change-Id: I00037ac7d3a4bf88ea027ded77f22bef212a5874
Jakub Pawlowski [Tue, 5 Dec 2017 18:28:42 +0000 (18:28 +0000)]
Merge "Add missing space in GATT_Register log"
am:
563d7af58d
Change-Id: Ic74998a761cfaedf42e18fceea0006c386a93a66
Treehugger Robot [Tue, 5 Dec 2017 18:07:27 +0000 (18:07 +0000)]
Merge "Add missing space in GATT_Register log"
Chao Quan [Tue, 5 Dec 2017 14:34:24 +0000 (14:34 +0000)]
Find connection ID on BR/EDR
am:
72b64d5302
Change-Id: I8a51ce2405720b000ce52c01855540ae45b33e3d
Chao Quan [Mon, 23 Oct 2017 11:56:16 +0000 (19:56 +0800)]
Find connection ID on BR/EDR
GATT profile may send service change indication to its
connected client and gatt_profile_find_conn_id_by_bd_addr
function helps gatt profile to find its connected client.
Gatt profile may use a BR/EDR link. So need to check it
also to avoid missing.
Test: manual
Change-Id: Ieb64cf6eab9d94352440c876be69990a7a4eb57f
Jakub Pawlowski [Tue, 5 Dec 2017 08:19:44 +0000 (00:19 -0800)]
Add missing space in GATT_Register log
Test: none
Change-Id: Idab3083daa68a958f33b264db1ff5e2f0c211ba5
Albin Joy [Tue, 5 Dec 2017 00:19:30 +0000 (00:19 +0000)]
HFP: notify HF about call status forcibly
am:
424f2cc7b7
Change-Id: Ib5495e1f600f82993382e4a0078af30fefd50fc4
Hansong Zhang [Fri, 1 Dec 2017 00:33:47 +0000 (16:33 -0800)]
Remove BluetoothHidDeviceAppConfiguration (1/4)
BluetoothHidDeviceAppConfiguration is no longer used. Remove it from
AIDL files.
Test: HID Device SL4A Test
Bug:
69981563
Merged-In: I23540fc10d114ac82cd3f484c0a472a6ba37807a
Change-Id: I23540fc10d114ac82cd3f484c0a472a6ba37807a
Albin Joy [Wed, 14 Jun 2017 11:10:42 +0000 (19:10 +0800)]
HFP: notify HF about call status forcibly
When call is hung up and still there is another
call is in active,some of the HF cannot acquire
the call states by its own. If HF try to terminate
a call, it may not send the command AT+CHUP because
the call states are not updated properly. HF should
get informed the call status forcibly.
Bug:
63411867
Test: motorola H500
Change-Id: I4025b39ebcef0bc915a6ab146ea3a5c5a8ebb2c2
Hemant Gupta [Fri, 1 Dec 2017 21:05:33 +0000 (21:05 +0000)]
Replace strncpy with strlcpy in HID and PAN code
am:
4449ed4412
Change-Id: Ie9aabc36fcc86b2b886206b7f018b0d2d932974e
Hemant Gupta [Mon, 12 Jun 2017 08:57:10 +0000 (14:27 +0530)]
Replace strncpy with strlcpy in HID and PAN code
Test: HID and PAN functionality work fine
Bug:
62525262
Change-Id: Icd4f9073a2356f3c8ecc4a23c22388b3509974e9
Hemant Gupta [Fri, 1 Dec 2017 19:37:05 +0000 (19:37 +0000)]
HID: Fix issues reported by Static Analysis Tool
am:
e70c11fc67
Change-Id: I69ce912dd8b3e69b7a2a97ff6917caf21ff3b586
Hemant Gupta [Wed, 29 Nov 2017 06:40:45 +0000 (12:10 +0530)]
HID: Fix issues reported by Static Analysis Tool
- Update error checking condition in bta_hh_le_co_cache_load API
to return if either num of report is 0 or if length of report is
less than size of report cache structure.
- Memset the report descriptor before use to properly initialize variables
not updated in function.
Test: builds, hid functionality works fine
Bug:
35013844
Change-Id: Ie0347307d7536f18bf8f32a2dfeda593a41933bf
Pavlin Radoslavov [Fri, 1 Dec 2017 01:50:18 +0000 (01:50 +0000)]
Enable multiple connection requests for same UUID if different addresses
am:
f270bd3253
Change-Id: I1d3cf0abc929f707940bee5ddb661106fcf92f41
Pavlin Radoslavov [Tue, 21 Nov 2017 20:47:21 +0000 (12:47 -0800)]
Enable multiple connection requests for same UUID if different addresses
Allow the BTIF Profile Queue to contain entries with same UUID, but
different addresses.
Also:
- Refactor the internal implementation of the Profile Queue to use
C++ std::list instead of the local osi/include/list.h implementation.
- Replaced struct connect_node_t with class ConnectNode, and moved the
connect callback logic to ConnectNode::connect().
- Simplified the implementation by replacing the existing callback
mechanism based on btif_transfer_context() with do_in_jni_thread().
- Updated the unit tests to test the new behavior.
Test: Manual and unit tests.
Bug:
69634326
Change-Id: I3c4021361902c19f004e2d8b56ad20e66a5a690a
Stanley Tng [Thu, 30 Nov 2017 17:47:20 +0000 (17:47 +0000)]
Merge "Fix assert when freeing L2CAP flow control credit packets"
am:
15cbc0e953
Change-Id: I2845cd484f4a734732578fe69a2498e0e8ad494b
Treehugger Robot [Thu, 30 Nov 2017 17:43:08 +0000 (17:43 +0000)]
Merge "Fix assert when freeing L2CAP flow control credit packets"
Stanley Tng [Tue, 28 Nov 2017 22:35:08 +0000 (14:35 -0800)]
Fix assert when freeing L2CAP flow control credit packets
The data buffers for the L2CEVT_L2CA_SEND_FLOW_CONTROL_CREDIT and
L2CEVT_L2CAP_RECV_FLOW_CONTROL_CREDIT packets do not need to be
freed.
Test: Run new SL4A Test for Connection-oriented channel
Bug:
69859537
Change-Id: Ice412a1c7f0a9b413376438a9fa34cf3f91482af
Jakub Pawlowski [Thu, 30 Nov 2017 08:21:22 +0000 (08:21 +0000)]
Merge "Add is_on_jni_thread"
am:
01d2c72529
Change-Id: Idc1dae5d338b08f3a4540566e12b8b4a5056af91
Treehugger Robot [Thu, 30 Nov 2017 08:17:26 +0000 (08:17 +0000)]
Merge "Add is_on_jni_thread"
Jakub Pawlowski [Thu, 30 Nov 2017 02:31:13 +0000 (18:31 -0800)]
Add is_on_jni_thread
is_on_jni_thread can be used to check if current thread is btif thread.
Test: compilation
Change-Id: I26e794c3771ae26e15e6cee6c3d4f9a1513571f4
Myles Watson [Wed, 29 Nov 2017 20:10:28 +0000 (20:10 +0000)]
Merge "test_vendor: Use the license template"
am:
06d65d281b
Change-Id: Ifa4a80ab9de9d6bba22abc299ff08b2b7e448df3
Treehugger Robot [Wed, 29 Nov 2017 20:06:20 +0000 (20:06 +0000)]
Merge "test_vendor: Use the license template"
Srinu Jella [Wed, 29 Nov 2017 19:58:06 +0000 (19:58 +0000)]
Merge "Added SPP version 1.2 to SDP record."
am:
77a10d857e
Change-Id: I5749099e436a0343080f30bb66d120ed7a74cc94
Treehugger Robot [Wed, 29 Nov 2017 19:51:55 +0000 (19:51 +0000)]
Merge "Added SPP version 1.2 to SDP record."
Myles Watson [Wed, 29 Nov 2017 18:43:56 +0000 (18:43 +0000)]
OSI: Copy temporary directoryname
am:
1a651dbddd
Change-Id: I6c796f8b18ba8e146d478358428ec06d5f2f6bea
Myles Watson [Wed, 29 Nov 2017 00:26:06 +0000 (16:26 -0800)]
OSI: Copy temporary directoryname
Bug:
69677828
Test: compiles
Change-Id: I70adc421812c71848712b03650aff2f85613ed81
Hemant Gupta [Wed, 29 Nov 2017 00:56:23 +0000 (00:56 +0000)]
Merge "PAN: Fix issues reported by Static Analysis Tool"
am:
1066862a95
Change-Id: I19dd06d77a87a18e57904d4776e4cc592955a37b
Treehugger Robot [Wed, 29 Nov 2017 00:51:41 +0000 (00:51 +0000)]
Merge "PAN: Fix issues reported by Static Analysis Tool"
Srinu Jella [Thu, 17 Nov 2016 09:04:50 +0000 (14:34 +0530)]
Added SPP version 1.2 to SDP record.
Added SPP version 1.2 to SDP record, SPP 1.0 is deprecated.
Test: mm -j8
Bug:
68303292
Change-Id: Ib0ed919d6145078fb9fc4214caae15ab6e7be780
Myles Watson [Wed, 22 Nov 2017 22:58:07 +0000 (14:58 -0800)]
test_vendor: Use the license template
development/docs/copyright-templates/
Test: build
Change-Id: Ibc69f0ee03f836619fa2d3f32417d31a4d9396e3
Colin Cross [Tue, 28 Nov 2017 22:22:41 +0000 (22:22 +0000)]
Export AIDL files as a filegroup framework.jar
am:
bcddf24fd9
Change-Id: I79b77d22cda3b392be1f6b6b0532d0c9e676b430
Colin Cross [Tue, 14 Nov 2017 21:05:37 +0000 (13:05 -0800)]
Export AIDL files as a filegroup framework.jar
Put AIDL files into a filegroup so they can be imported as sources
for framework.jar.
Test: m checkbuild
Change-Id: Ie3ff041f58fb86c42e5c31b8bed7dfe2c2f9b6f2
Jakub Pawlowski [Tue, 28 Nov 2017 05:57:42 +0000 (05:57 +0000)]
btif storage: use strings where possible
am:
b7710f0565
Change-Id: I84c8fea3e8edca9dc107f197c8a7ddd9cac4371b
Jakub Pawlowski [Mon, 27 Nov 2017 19:20:02 +0000 (11:20 -0800)]
btif storage: use strings where possible
btif_config api used to accept "const char*" as parameter. After the
refactoring it started using std::string. Remove unnecessary ".c_str()"
Test: compilation
Bug:
67595284
Change-Id: I173bbffc98f4e1f2dd3db1ff6db5a27db9be8992
Srinu Jella [Tue, 28 Nov 2017 04:09:57 +0000 (04:09 +0000)]
Saving Bluetooth name to Max 248 character only.
am:
f04ea90af3
Change-Id: If0e74006f83cdd62ec8b72c847825758cb8c1701
Yan Laijun [Tue, 28 Nov 2017 04:09:34 +0000 (04:09 +0000)]
Correctly handling bdaddr in function btif_storage_load_bonded_hid_info.
am:
f92bdc7caf
Change-Id: Id66ad93f617dfeb550b4f616639ac5bbb767f61c
Srinu Jella [Fri, 30 Dec 2016 10:20:48 +0000 (15:50 +0530)]
Saving Bluetooth name to Max 248 character only.
Steps:
1. Set the BT name more than 248 character using SDK API set_name.
2. Check the BT Name on bt_config.
3. Name should be also visible Setting Apps on Bluetooth.
Failure: BluetoothAdapterProperties and stack are not in sync.
Root Cause: No check for the Bluetooth name length.
We can handle in framework layer but now handling in Stack.
Fix: Check the length of Bluetooth Name before writing to the file.
Test: Application and Stack BD Name are in sync
Bug:
35126970
Change-Id: I856a66e863cec68bee38762903a0b762ab0626d2
Yan Laijun [Wed, 7 Dec 2016 01:49:08 +0000 (09:49 +0800)]
Correctly handling bdaddr in function btif_storage_load_bonded_hid_info.
Correct the bdaddr param passed into function btif_storage_remove_hid_info.
Test: mm -j8
Change-Id: I9b7994982577d68d076a6429f97d66b3ea4c8ce4
Signed-off-by: Yan Laijun <yan-laijun@xiaomi.com>
Jakub Pawlowski [Mon, 27 Nov 2017 21:38:23 +0000 (21:38 +0000)]
G.722 Codec for Hearing Aid
am:
2fd870e7dd
Change-Id: Ib9e4f186032e927173147f18c56ce167bea25e87
Jakub Pawlowski [Fri, 24 Nov 2017 23:19:54 +0000 (15:19 -0800)]
G.722 Codec for Hearing Aid
Test: compilation
Bug:
69623109
Change-Id: I4658167f50321b717295f48c8b0b66d50ffabefd
Hemant Gupta [Tue, 28 Feb 2017 17:08:50 +0000 (22:38 +0530)]
PAN: Fix issues reported by Static Analysis Tool
Fix issues reported by Static Analysis Tool.
Test: builds, PAN functionality works fine
Bug:
35013844
Change-Id: I55e75fe5e522ab5c417557d4ef9a11723dfd0c3c
Hemant Gupta [Thu, 23 Nov 2017 11:44:59 +0000 (11:44 +0000)]
BLE: Fix crash while starting advertising
am:
8ddafa16c0
Change-Id: Ibdfbe1a1b89f46beec886024d305691db8a3dd5e
Hemant Gupta [Wed, 22 Nov 2017 09:12:07 +0000 (14:42 +0530)]
BLE: Fix crash while starting advertising
Usecase:
1) BT on
2) Start LE Advertising from APP
3) BT Off
4) Repeat steps 1-3 multiple times
Expected Result:
No crash in BT, and BLE advertising can be started
Observed Result:
Crash in com.android.bluetooth with below signature
pid: 8313, tid: 8313, name: droid.bluetooth >>> com.android.bluetooth <<<
signal 6 (SIGABRT), code -6 (SI_TKILL), fault addr --------
Abort message: '[FATAL:btm_ble_multi_adv.cc(992)] Check failed: instance.
'
x0
0000000000000000 x1
0000000000002079 x2
0000000000000006 x3
0000000000000008
x4
623a4c415441465b x5
623a4c415441465b x6
623a4c415441465b x7
6d5f656c625f6d74
x8
0000000000000083 x9
0823626ef495785d x10
00000073b7b39a48 x11
0823626ef495785d
x12
0823626ef495785d x13
0000000000000020 x14
ffffffffffffffdf x15
0000000000002079
x16
00000073b5ce62e8 x17
00000073b5c79970 x18
0000000000004000 x19
0000000000002079
x20
0000000000002079 x21
0000000000000000 x22
0000007398bde000 x23
0000007fd0809e88
x24
00000073a3b4c860 x25
00000073a635b578 x26
0000007398e980cc x27
0000007398e97fd3
x28
0000007398cb5608 x29
0000007fd0809e30 x30
00000073b5c20594
sp
0000007fd0809df0 pc
00000073b5c79978 pstate
0000000060000000
v0
2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e v1
0000007fd0809be00000676f6c62696c
v2
00000002b71fc7400000000000000000 v3
80200800000000008020000000000000
v4
80200800000000008020080280200802 v5
00000000000000000000000000000000
v6
00000000000000000000000000000000 v7
80200802802008028020080280200802
v8
00000000000000000000000000000000 v9
00000000000000000000000000000000
v10
00000000000000000000000000000000 v11
00000000000000000000000000000000
v12
00000000000000000000000000000000 v13
00000000000000000000000000000000
v14
00000000000000000000000000000000 v15
00000000000000000000000000000000
v16
40100401401004014010040140100401 v17
a0080000a00aa00aa800aaaaa800a000
v18
80200800000000008020080280200802 v19
00000000000000000000000000000000
v20
00000000000000000000000000000000 v21
00000000000000000000000000000000
v22
00000000000000000000000000000000 v23
00000000000000000000000000000000
v24
00000000000000000000000000000000 v25
00000000000000000000000000000000
v26
00000000000000000000000000000000 v27
00000000000000000000000000000000
v28
00000000000000000000000000000000 v29
00000000000000000000000000000000
v30
00000000000000000000000000000000 v31
00000000000000000000000000000000
fpsr
00000013 fpcr
00000000
backtrace:
#00 pc
0000000000077978 /system/lib64/libc.so (tgkill+8)
#01 pc
000000000001e590 /system/lib64/libc.so (abort+88)
#02 pc
00000000000836dc /system/lib64/libchrome.so (_ZN4base5debug13BreakDebuggerEv+20)
#03 pc
000000000009bed0 /system/lib64/libchrome.so (_ZN7logging10LogMessageD2Ev+840)
#04 pc
000000000015ed7c /system/lib64/hw/bluetooth.default.so (_ZN21BleAdvertisingManager3GetEv+72)
#05 pc
00000000000a7754 /system/lib64/hw/bluetooth.default.so (_ZN12_GLOBAL__N_126BleAdvertiserInterf
aceImpl19StartAdvertisingSetEN4base8CallbackIFvhahELNS1_8internal8CopyModeE1EEE19AdvertiseParametersNSt3
__16vectorIhNS8_9allocatorIhEEEESC_29PeriodicAdvertisingParametersSC_thNS2_IFvhhELS5_1EEE+332)
#06 pc
000000000002a354 /system/lib64/libbluetooth_jni.so (_ZN7androidL25startAdvertisingSetNativeEP7_
JNIEnvP8_jobjectS3_P11_jbyteArrayS5_S3_S5_iii+1276)
#07 pc
00000000005b2834 /data/dalvik-cache/arm64/system@app@Bluetooth@Bluetooth.apk@classes.dex (offset 0x2cd000)
Root Cause:
API calls in btif_ble_advertiser.cc donot check for initialization status of BleAdvertisingManager leading
to crash in scenarios when the BleAdvertisingManager is cleaned up during BT off and call reaches
btif_ble_advertiser.cc to do one ofadvertising related tasks.
Fix:
Add initialization check in code before call to API's for BleAdvertisingManager
Test: No crash observed after overnight testing with same usecase
Bug:
69692308
Change-Id: I5484734a4cf52858676981808c898ffec11e23f4
Dayananda V [Tue, 21 Nov 2017 18:38:25 +0000 (18:38 +0000)]
Merge "Advertising device name truncated"
am:
9e75fa4400
Change-Id: I4b3e9f53ec1a2c45598434ee3a5baa75129ce07e
Treehugger Robot [Tue, 21 Nov 2017 18:34:22 +0000 (18:34 +0000)]
Merge "Advertising device name truncated"
Myles Watson [Tue, 21 Nov 2017 02:48:17 +0000 (02:48 +0000)]
Merge "test_vendor: Make BtAddress comparisons const"
am:
ecdc8c16a8
Change-Id: I2fd15bc73226414fc982191209526dd410805c67
Treehugger Robot [Tue, 21 Nov 2017 02:39:34 +0000 (02:39 +0000)]
Merge "test_vendor: Make BtAddress comparisons const"
Chih-Hung Hsieh [Mon, 20 Nov 2017 22:36:04 +0000 (22:36 +0000)]
Use -Werror in system/bt/binder
am:
759b57daea
Change-Id: I3faf809931c8261d0074b4f7abf52169e219283d
Chih-Hung Hsieh [Mon, 20 Nov 2017 18:25:49 +0000 (10:25 -0800)]
Use -Werror in system/bt/binder
Bug:
66996870
Test: build with WITH_TIDY=1
Change-Id: I68880c0c6d6e886b9d12482e97d35deea61cc5ab
Pavlin Radoslavov [Mon, 20 Nov 2017 17:17:13 +0000 (17:17 +0000)]
Merge "Removed unused or unnecessary defines"
am:
c047e451bb
Change-Id: I5da696c40966e4bbca0c81d472f882547f6302aa
Treehugger Robot [Mon, 20 Nov 2017 17:11:42 +0000 (17:11 +0000)]
Merge "Removed unused or unnecessary defines"
Daniel Cardenas [Sat, 18 Nov 2017 04:47:26 +0000 (04:47 +0000)]
Fix broken PDK build, by disabling libbluetooth-binder during PDK build.
am:
02c49bc93f
Change-Id: Iaabea7944dc56ff4faebb38a9e1ae9ea04854ead
Daniel Cardenas [Sat, 18 Nov 2017 02:18:28 +0000 (18:18 -0800)]
Fix broken PDK build, by disabling libbluetooth-binder during PDK build.
Fixes:
69479982
Test: Build
Change-Id: Ie05c67e2b22c3f549239be1d7d6e9c3c22543498
Pavlin Radoslavov [Sat, 18 Nov 2017 00:23:16 +0000 (16:23 -0800)]
Removed unused or unnecessary defines
Removed the following defines because they are unused or unnecessary:
- AVDT_REPORTING
- AVRC_METADATA_INCLUDED
- BTA_INCLUDED
- SBC_FOR_EMBEDDED_LINUX
- BTA_AVRCP_FF_RW_SUPPORT
- GATT_DB_BUF_SIZE
- BTM_DEFAULT_SCO_MODE
- BTM_BLE_ADV_TX_POWER
- BTM_BLE_ADV_TX_POWER_*
- ATT_INCLUDED
- ATT_DEBUG
- GAP_TRANSPORT_SUPPORTED
- GATTP_TRANSPORT_SUPPORTED
- PORT_CREDIT_RX_MAX
- PORT_CREDIT_RX_LOW
- AVDT_INCLUDED
- AVDT_REPORTING
- HID_DEV_SUBCLASS
- A2D_INCLUDED
Also:
- Changed tBTA_AV_SCB field p_cap from dynamically allocated to
inlined storage, and renamed it to peer_cap.
- Removed unused typedef tBTM_BLE_ADV_TX_POWER
Test: Manual: streaming to Headset.
Change-Id: I0db18cc7ae3b9e692c71b430436f3170e8e4d65e
Pavlin Radoslavov [Fri, 17 Nov 2017 19:07:54 +0000 (19:07 +0000)]
Remove unnecessery re-defininitions of BTA_AV constants
am:
e7510d9bf4
Change-Id: I285dbb79740cd434e2a899539c0ff5752105d159