OSDN Git Service
Myles Watson [Fri, 2 Nov 2018 23:03:56 +0000 (16:03 -0700)]
Merge "SDP: Check p_end in save_attr_seq and add_attr" into pi-dev
am:
13a959b777
Change-Id: I252a3c12c551c0fc62cd09c9ff14b6863ef58cbf
TreeHugger Robot [Fri, 2 Nov 2018 22:49:35 +0000 (22:49 +0000)]
Merge "SDP: Check p_end in save_attr_seq and add_attr" into pi-dev
Jakub Pawlowski [Fri, 2 Nov 2018 13:30:33 +0000 (06:30 -0700)]
Cleanup LE White List HCI interface am:
553e88bd1f
am:
972b41ccf3
Change-Id: I35f2cbbc48f9a9ed55d04e051111fca27d57c698
Jakub Pawlowski [Fri, 2 Nov 2018 13:16:26 +0000 (06:16 -0700)]
Cleanup LE White List HCI interface
am:
553e88bd1f
Change-Id: I08c7e027598302105e585971de127aed5ee6bd86
Jakub Pawlowski [Tue, 30 Oct 2018 21:49:30 +0000 (22:49 +0100)]
Cleanup LE White List HCI interface
Replace global functions with callbacks, to reduce interface size.
Test: add/remove at least two devices in whitelist, verify HCI snoop log
Bug:
112827989
Change-Id: Id05c9f4970bbb795309a3a233f83559bcc1c56e2
Ugo Yu [Fri, 2 Nov 2018 04:43:55 +0000 (21:43 -0700)]
[automerger skipped] Merge "DO NOT MERGE: Fix possible OOB when AVDT data channel recive ACL data" into oc-dev am:
5b3764ada2 -s ours am:
d23783330e -s ours am:
5a706ef567 -s ours
am:
606bbc1aab -s ours
Change-Id: Ica03387f8dc1ff200730c53ce3a2f701de2cbea5
Ugo Yu [Fri, 2 Nov 2018 04:39:33 +0000 (21:39 -0700)]
[automerger skipped] Merge "DO NOT MERGE: Fix possible OOB when AVDT data channel recive ACL data" into oc-dev am:
5b3764ada2 -s ours am:
d23783330e -s ours
am:
5a706ef567 -s ours
Change-Id: Ic5da5b23c80d2344ca0a17862ae2cffad172e639
Ugo Yu [Fri, 2 Nov 2018 04:35:42 +0000 (21:35 -0700)]
[automerger skipped] Merge "DO NOT MERGE: Fix possible OOB when AVDT data channel recive ACL data" into oc-dev am:
5b3764ada2 -s ours
am:
d23783330e -s ours
Change-Id: Ibf80fd7ad5da69b61a2f36181ff9989eeb52659a
Ugo Yu [Fri, 2 Nov 2018 04:31:37 +0000 (21:31 -0700)]
[automerger skipped] Merge "DO NOT MERGE: Fix possible OOB when AVDT data channel recive ACL data" into oc-dev
am:
5b3764ada2 -s ours
Change-Id: If234a0b7b075098d8f42153138d5a72a78fb82b9
TreeHugger Robot [Fri, 2 Nov 2018 04:17:54 +0000 (04:17 +0000)]
Merge "DO NOT MERGE: Fix possible OOB when AVDT data channel recive ACL data" into oc-dev
Ugo Yu [Mon, 29 Oct 2018 16:47:04 +0000 (00:47 +0800)]
DO NOT MERGE: Fix possible OOB when AVDT data channel recive ACL data
Bug:
111450156
Change-Id: Id23eeedcb7bde5866cd53a2f7f1c30f27c5352f6
Merged-In: Id23eeedcb7bde5866cd53a2f7f1c30f27c5352f6
(cherry picked from commit
b0125caafec2183d73fc899ce5a8aee43a6e54af)
Ugo Yu [Thu, 1 Nov 2018 18:35:59 +0000 (11:35 -0700)]
Merge changes from topic "am-
6595535a-66ae-4551-9774-
048441013dbf" into oc-dev am:
31d6e17ffa am:
c59c3fa0b2 am:
617a844b22
am:
798d7e021e
Change-Id: Ia86c6273b926c37d8e820d66c5036b1132dad930
Ugo Yu [Thu, 1 Nov 2018 18:35:22 +0000 (11:35 -0700)]
Fix OOB in avrc_pars_browse_rsp am:
32a33dc12d am:
8fe5c0bc2a am:
3c9dbf8a41
am:
bfe0b7dbe6
Change-Id: Ifea1ac1647368098fb6baf80781fee6b09a2e547
Ugo Yu [Thu, 1 Nov 2018 18:31:51 +0000 (11:31 -0700)]
Merge changes from topic "am-
6595535a-66ae-4551-9774-
048441013dbf" into oc-dev am:
31d6e17ffa am:
c59c3fa0b2
am:
617a844b22
Change-Id: I7d26255ae4369e091d077c28baaa1e4977bf6e0f
Ugo Yu [Thu, 1 Nov 2018 18:31:17 +0000 (11:31 -0700)]
Fix OOB in avrc_pars_browse_rsp am:
32a33dc12d am:
8fe5c0bc2a
am:
3c9dbf8a41
Change-Id: I81268ca85f4f0cc6dbe02d579539ba617095f937
Ugo Yu [Thu, 1 Nov 2018 18:26:10 +0000 (11:26 -0700)]
[automerger skipped] DO NOT MERGE: Fix possible OOB when AVDT data channel recive ACL data am:
f349ff0c65 -s ours
am:
71c5b24280
Change-Id: I0b52641f0290b4b3e6a08f706baa72894da7b93a
Ugo Yu [Thu, 1 Nov 2018 18:25:35 +0000 (11:25 -0700)]
Merge changes from topic "am-
6595535a-66ae-4551-9774-
048441013dbf" into oc-dev am:
31d6e17ffa
am:
c59c3fa0b2
Change-Id: I42910e2c4665250ff6cebfd6ad671db5c2a9969d
Ugo Yu [Thu, 1 Nov 2018 18:25:02 +0000 (11:25 -0700)]
Fix OOB in avrc_pars_browse_rsp am:
32a33dc12d
am:
8fe5c0bc2a
Change-Id: I826a12ff77f541d3400a8da4e6d4a0946ed7f85d
Ugo Yu [Thu, 1 Nov 2018 18:18:58 +0000 (11:18 -0700)]
Merge changes from topic "am-
6595535a-66ae-4551-9774-
048441013dbf" into oc-dev
am:
31d6e17ffa
Change-Id: Ic9a26f8c164d74731eda6ce98c26c60395e841a3
Ugo Yu [Thu, 1 Nov 2018 18:17:54 +0000 (11:17 -0700)]
Fix possible OOB when AVDT data channel recive ACL data
am:
baa9bf5bfe
Change-Id: If46ed7f13579c221628db9f5457be25c5dc45287
Ugo Yu [Thu, 1 Nov 2018 18:17:51 +0000 (11:17 -0700)]
Fix OOB in avrc_pars_browse_rsp
am:
32a33dc12d
Change-Id: I8b899527c6fe359dc0d4b009f539ef2b4270d7f7
Ugo Yu [Thu, 1 Nov 2018 18:17:46 +0000 (11:17 -0700)]
[automerger skipped] DO NOT MERGE: Fix possible OOB when AVDT data channel recive ACL data
am:
f349ff0c65 -s ours
Change-Id: I5413adf2ceaedc9c397c743d9758cf49cdcc49fa
TreeHugger Robot [Thu, 1 Nov 2018 18:04:03 +0000 (18:04 +0000)]
Merge changes from topic "am-
6595535a-66ae-4551-9774-
048441013dbf" into oc-dev
* changes:
[automerger] DO NOT MERGE: Fix possible OOB when AVDT data channel recive ACL data am:
ad4098c340 am:
8ee587afbb am:
bf3c65e987 am:
6055cb79e5 skipped:
36f3c8f9f3
[automerger] DO NOT MERGE: Fix possible OOB when AVDT data channel recive ACL data am:
ad4098c340 am:
8ee587afbb am:
bf3c65e987 am:
6055cb79e5
[automerger] DO NOT MERGE: Fix possible OOB when AVDT data channel recive ACL data am:
ad4098c340 am:
8ee587afbb am:
bf3c65e987
[automerger] DO NOT MERGE: Fix possible OOB when AVDT data channel recive ACL data am:
ad4098c340 am:
8ee587afbb
[automerger] DO NOT MERGE: Fix possible OOB when AVDT data channel recive ACL data am:
ad4098c340
DO NOT MERGE: Fix possible OOB when AVDT data channel recive ACL data
jonerlin [Thu, 1 Nov 2018 06:30:58 +0000 (23:30 -0700)]
Merge "HFP: support pause character "Comma" in acceptable dial digit string" am:
33c4b665b2
am:
8405b491c7
Change-Id: Idb551441331f3d9b75140e3e05bb8965d901385f
jonerlin [Thu, 1 Nov 2018 06:21:56 +0000 (23:21 -0700)]
Merge "HFP: support pause character "Comma" in acceptable dial digit string"
am:
33c4b665b2
Change-Id: I28a7fe3aff8da888aa26b89047babd7d6047ec35
Treehugger Robot [Thu, 1 Nov 2018 06:07:45 +0000 (06:07 +0000)]
Merge "HFP: support pause character "Comma" in acceptable dial digit string"
Myles Watson [Thu, 25 Oct 2018 00:05:12 +0000 (17:05 -0700)]
SDP: Check p_end in save_attr_seq and add_attr
Bug:
115900043
Test: Sanity pairing and SDP PTS
Change-Id: Ib642f79ed22b65ede5ff786cb1e163d172480f11
Ugo Yu [Fri, 26 Oct 2018 10:15:17 +0000 (18:15 +0800)]
Fix OOB in avrc_pars_browse_rsp
- Check packet length before assign bytes to the pointer.
Bug:
111451066
Test: PoC test
Change-Id: I8ce4f4678a043fc16b0beeea2345253e7542b506
Android Build Merger (Role) [Wed, 31 Oct 2018 23:35:12 +0000 (23:35 +0000)]
[automerger] DO NOT MERGE: Fix possible OOB when AVDT data channel recive ACL data am:
ad4098c340 am:
8ee587afbb am:
bf3c65e987 am:
6055cb79e5 skipped:
36f3c8f9f3
Change-Id: I05388dfce317c96f54d793e15c5aeb648d0dbb95
Android Build Merger (Role) [Wed, 31 Oct 2018 23:35:09 +0000 (23:35 +0000)]
[automerger] DO NOT MERGE: Fix possible OOB when AVDT data channel recive ACL data am:
ad4098c340 am:
8ee587afbb am:
bf3c65e987 am:
6055cb79e5
Change-Id: Ie32fce429a36bbd531929e0a2baaf64814e62f03
Android Build Merger (Role) [Wed, 31 Oct 2018 23:35:06 +0000 (23:35 +0000)]
[automerger] DO NOT MERGE: Fix possible OOB when AVDT data channel recive ACL data am:
ad4098c340 am:
8ee587afbb am:
bf3c65e987
Change-Id: If43dc850794289bec31c7a3d5853bb49f5571703
Android Build Merger (Role) [Wed, 31 Oct 2018 23:35:03 +0000 (23:35 +0000)]
[automerger] DO NOT MERGE: Fix possible OOB when AVDT data channel recive ACL data am:
ad4098c340 am:
8ee587afbb
Change-Id: Id0a40d0a6138e05b9038a09751a53a3f6deef786
Android Build Merger (Role) [Wed, 31 Oct 2018 23:35:00 +0000 (23:35 +0000)]
[automerger] DO NOT MERGE: Fix possible OOB when AVDT data channel recive ACL data am:
ad4098c340
Change-Id: I43e5409e91d531854545e2d9ed10389f8f10db01
Ugo Yu [Mon, 29 Oct 2018 17:57:06 +0000 (01:57 +0800)]
DO NOT MERGE: Fix possible OOB when AVDT data channel recive ACL data
Bug:
111450156
Change-Id: Id23eeedcb7bde5866cd53a2f7f1c30f27c5352f6
(cherry picked from commit
b0125caafec2183d73fc899ce5a8aee43a6e54af)
Ugo Yu [Mon, 29 Oct 2018 16:47:04 +0000 (00:47 +0800)]
DO NOT MERGE: Fix possible OOB when AVDT data channel recive ACL data
Bug:
111450156
Change-Id: Id23eeedcb7bde5866cd53a2f7f1c30f27c5352f6
(cherry picked from commit
b0125caafec2183d73fc899ce5a8aee43a6e54af)
Ugo Yu [Mon, 29 Oct 2018 16:47:04 +0000 (00:47 +0800)]
Fix possible OOB when AVDT data channel recive ACL data
Bug:
111450156
Change-Id: Id23eeedcb7bde5866cd53a2f7f1c30f27c5352f6
Jakub Pawlowski [Wed, 31 Oct 2018 00:09:32 +0000 (17:09 -0700)]
HCI: accept OnceCallback instad of Callback am:
c74471dcac
am:
cccfed4035
Change-Id: Ieedaace8ec14eb96db5e3c0d24e5c81ba648267b
Jakub Pawlowski [Wed, 31 Oct 2018 00:05:29 +0000 (17:05 -0700)]
HCI: accept OnceCallback instad of Callback
am:
c74471dcac
Change-Id: Ic0d01c5864fe714d89887bdb9e9efd5700ec80bb
Jakub Pawlowski [Tue, 30 Oct 2018 17:29:36 +0000 (18:29 +0100)]
HCI: accept OnceCallback instad of Callback
Command complete is guaranteed to happen only once by HCI spec.
Test: run sl4a tests around advertising, which use callback
Change-Id: I3c40ed21c56b41649bbc9519d280339b1cbb285f
Jakub Pawlowski [Tue, 30 Oct 2018 07:04:07 +0000 (00:04 -0700)]
Merge changes Ie4f783b0,I456a18c6,I8c57dd5a am:
90fd7638eb
am:
e0c28d360b
Change-Id: If37c6513df7b378c4c21ce1f34292436c1b1b1d7
Jakub Pawlowski [Tue, 30 Oct 2018 07:00:05 +0000 (00:00 -0700)]
Merge changes Ie4f783b0,I456a18c6,I8c57dd5a
am:
90fd7638eb
Change-Id: I4d7b6140e50db7acbcc782c2a985cd5acaec7d9f
Treehugger Robot [Tue, 30 Oct 2018 06:41:08 +0000 (06:41 +0000)]
Merge changes Ie4f783b0,I456a18c6,I8c57dd5a
* changes:
Small cleanup in GATT white list
Separate GATT white list from global GATT control block.
Move white list specific code in GATT to separate file
jonerlin [Tue, 30 Oct 2018 06:09:41 +0000 (14:09 +0800)]
HFP: support pause character "Comma" in acceptable dial digit string
* To avoid bt stack filter MO call initiated from HF end with by sending dial command with modifier character "," (Comma)
Bug:
118401445
Test: making MO call from carkit/equipment by sending ATD command with phone number plus comma plus DTMF digitals
Change-Id: I5acb913a3c034f10ad704c1b8466634df122b580
Weichin Weng [Tue, 30 Oct 2018 02:48:36 +0000 (19:48 -0700)]
Merge "Hearing Aid: Combine audio from stereo to mono when only one side connect" am:
39ac817b2c
am:
a1b7857a48
Change-Id: I4fca2dfd6c0fe706cfc577efedf53e30e508a422
Weichin Weng [Tue, 30 Oct 2018 02:35:37 +0000 (19:35 -0700)]
Merge "Hearing Aid: Combine audio from stereo to mono when only one side connect"
am:
39ac817b2c
Change-Id: Iefe6a38b484384cc3ccc02942d15da8c68ca3eee
Weichin Weng [Tue, 30 Oct 2018 02:08:44 +0000 (02:08 +0000)]
Merge "Hearing Aid: Combine audio from stereo to mono when only one side connect"
Jakub Pawlowski [Mon, 29 Oct 2018 14:53:35 +0000 (15:53 +0100)]
Small cleanup in GATT white list
* move local helper functions into local namespace
* reduce dependency on other modules
Bug:
112827989
Test: compilation
Change-Id: Ie4f783b00b5d0b77698412e09e35a5d11ed8f5f6
Jakub Pawlowski [Mon, 29 Oct 2018 10:24:32 +0000 (11:24 +0100)]
Separate GATT white list from global GATT control block.
Bug:
112827989
Test: compilation, no functional changes
Change-Id: I456a18c6ce567991c4768afaaa3266085a9d30fb
Jakub Pawlowski [Mon, 29 Oct 2018 09:17:23 +0000 (10:17 +0100)]
Move white list specific code in GATT to separate file
Test: compilation, no functional change
Bug:
112827989
Change-Id: I8c57dd5a3b0d6c088acc1a40d9f3437428a8bd8b
Jakub Pawlowski [Fri, 26 Oct 2018 22:32:00 +0000 (15:32 -0700)]
BTM_BleClearBgConnDev -> BTM_WhiteListClear am:
2b48d178f4
am:
f065d5f1af
Change-Id: Ia670510d6d7c38f83b8d030ee626c7909d691d00
Jakub Pawlowski [Fri, 26 Oct 2018 22:23:56 +0000 (15:23 -0700)]
BTM_BleClearBgConnDev -> BTM_WhiteListClear
am:
2b48d178f4
Change-Id: I8c6ed94643dbc683805cd0651fa6bf9f3fb8ae13
Jakub Pawlowski [Fri, 26 Oct 2018 10:31:41 +0000 (12:31 +0200)]
BTM_BleClearBgConnDev -> BTM_WhiteListClear
BTM_WhiteList* functions are called only from gatt_utils.cc.
BTM_BleClearBgConnDev is currently an exception - instead of being
called from there, it does call gatt_reset_bgdev_list. This patch fixes
that.
Test: compilation, no functional change
Bug:
112827989
Change-Id: I4cd5bfee44c46d2ef37912496cd6cf5298ab1dfc
Jakub Pawlowski [Fri, 26 Oct 2018 18:04:59 +0000 (11:04 -0700)]
Split BTM_BleUpdateBgConnDev into BTM_WhiteListAdd and BTM_WhiteListRemove am:
4f688287f3
am:
fcd7514eaa
Change-Id: I4237a6945f54915277772e6402e8bddefc03e0ce
Jakub Pawlowski [Fri, 26 Oct 2018 18:00:58 +0000 (11:00 -0700)]
Split BTM_BleUpdateBgConnDev into BTM_WhiteListAdd and BTM_WhiteListRemove
am:
4f688287f3
Change-Id: I63993dcc85a8278d9de76dd5d7d0a8d4514f5508
Jakub Pawlowski [Fri, 26 Oct 2018 09:29:56 +0000 (11:29 +0200)]
Split BTM_BleUpdateBgConnDev into BTM_WhiteListAdd and BTM_WhiteListRemove
There is very little common code between both codepath. Having them
separate makes the code cleaner.
Test: compilation, no functional changes.
Bug:
112827989
Change-Id: I936f69a93366d3230df4435fc4b24962cc0bd4b2
Jakub Pawlowski [Fri, 26 Oct 2018 10:38:50 +0000 (03:38 -0700)]
Linux build fix am:
c8dcd258c1
am:
c73f3391d9
Change-Id: I8acba98528f41df833442d93f8fc4c98a27b88ad
Jakub Pawlowski [Fri, 26 Oct 2018 10:34:47 +0000 (03:34 -0700)]
Linux build fix
am:
c8dcd258c1
Change-Id: I63200c093331a8e47bce90d8fb84c4675872b305
Jakub Pawlowski [Thu, 25 Oct 2018 13:12:43 +0000 (15:12 +0200)]
Linux build fix
Move metrics_linux.cc into common/, where the metrics live now.
Add btif_avrcp_audio_track_linux.cc
Fix BUILD.gn files.
Define FALLTHROUGH_INTENDED for linux, to fix build error.
Test: build with ninja and run on linux
Change-Id: I117d19ed25828389c385f09ad731e8bd61b38030
weichinweng [Fri, 26 Oct 2018 09:21:13 +0000 (17:21 +0800)]
Hearing Aid: Combine audio from stereo to mono when only one side connect
* On the design of the Hearing Aids, the phone will separate the stereo
audio samples and stream the left audio samples to the left device and
right audio samples to the right device. When only one side connected,
phone will only stream the one side audio sample to one hearing aid
device.
* This CL adds a functionality for checking the left/right hearing aid
and combine audio samples from stereo to mono when only on side connect.
Bug:
117178490
Test: disconnected/reconnected one side hearing when play stereo test
sound.
Change-Id: Idb3871951617680aba3ca82f801a70c95403d889
Jakub Pawlowski [Fri, 26 Oct 2018 07:15:45 +0000 (00:15 -0700)]
Minor style fixes in gatt_api.cc am:
0f79e35069
am:
7cc2adff9b
Change-Id: I08563efce7eb4cd7177490fdb8aec0b0f0c92121
Jakub Pawlowski [Fri, 26 Oct 2018 07:11:37 +0000 (00:11 -0700)]
Minor style fixes in gatt_api.cc
am:
0f79e35069
Change-Id: I7201098e67aac2bd1dd4bde265e7901c24d3a8ed
Jakub Pawlowski [Thu, 25 Oct 2018 22:23:21 +0000 (00:23 +0200)]
Minor style fixes in gatt_api.cc
Test: compilation
Change-Id: I3050d84443149a5ed77ab1e07f079553546b628c
Jack He [Fri, 26 Oct 2018 01:36:42 +0000 (18:36 -0700)]
Merge "Add siyuanh@google.com to OWNERS" am:
2ceaa8c9e3
am:
e680712bd3
Change-Id: Iaa12fdbb7e263b39911b4c3287e9ad1be5fd0f71
Jack He [Fri, 26 Oct 2018 01:32:37 +0000 (18:32 -0700)]
Merge "Add siyuanh@google.com to OWNERS"
am:
2ceaa8c9e3
Change-Id: I3b83f3aea640b021585f963a10ae7d195091ce9e
Treehugger Robot [Fri, 26 Oct 2018 01:16:15 +0000 (01:16 +0000)]
Merge "Add siyuanh@google.com to OWNERS"
Jakub Pawlowski [Fri, 26 Oct 2018 00:51:17 +0000 (17:51 -0700)]
Split gatt_update_auto_connect_dev into separate add/remove functions am:
80c28c6eda
am:
ee59b1802f
Change-Id: I465ea40230a42d7260e2edfb96a95e1c4d38465c
Jakub Pawlowski [Fri, 26 Oct 2018 00:47:11 +0000 (17:47 -0700)]
Split gatt_update_auto_connect_dev into separate add/remove functions
am:
80c28c6eda
Change-Id: I1b6f1529dd664239ff79ae531dfa96fbe4055e4f
Jakub Pawlowski [Thu, 25 Oct 2018 21:04:14 +0000 (23:04 +0200)]
Split gatt_update_auto_connect_dev into separate add/remove functions
Test: compilation, no functional changes
Change-Id: I58b5d565753e0c1b99a3b06b27074b593f3b903b
Bill Yi [Thu, 25 Oct 2018 02:42:31 +0000 (19:42 -0700)]
[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am:
969a599faa -s ours
am:
81d466dbb6 -s ours
Change-Id: I6de2b6a89bb6546fbd2295185f260643b555a058
Jakub Pawlowski [Thu, 25 Oct 2018 02:31:56 +0000 (19:31 -0700)]
Merge "separate btm_ble_stop_auto_conn from btm_ble_start_auto_conn" am:
da21153044
am:
bb221fa027
Change-Id: I2b170a1e909d48dbd482fbc58cb1feca78136cb9
Bill Yi [Thu, 25 Oct 2018 02:02:42 +0000 (19:02 -0700)]
[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE
am:
366df93249 -s ours
Change-Id: I6c43d610c5c3a2edb2db105120db31f520fb101d
Jakub Pawlowski [Wed, 24 Oct 2018 23:50:55 +0000 (16:50 -0700)]
service: don't use android::String16 in platform-independent code am:
7b00a3b645
am:
2271bdec11
Change-Id: I783dd519d22357427887cf8beeda32ab0350302a
Chih-Hung Hsieh [Wed, 24 Oct 2018 23:49:03 +0000 (16:49 -0700)]
Allow implicit-fallthrough warnings locally. am:
c1ae0ab3c5
am:
6115e13ec4
Change-Id: I73e5d7eb7eef8f80e7cbafc583e584273b6994fa
Jakub Pawlowski [Wed, 24 Oct 2018 23:46:57 +0000 (16:46 -0700)]
Fix errors around logging when compiling on Linux am:
e4f1378d34
am:
770e1b50c1
Change-Id: Icce095846adbc0aa3474bc74654d0113bee92eca
Bill Yi [Wed, 24 Oct 2018 22:53:09 +0000 (15:53 -0700)]
[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE
am:
969a599faa -s ours
Change-Id: I6a4842e74bcb350096cea09321fb25cf79364ab7
Jakub Pawlowski [Wed, 24 Oct 2018 22:47:43 +0000 (15:47 -0700)]
Partial fix for linux build am:
292ab25ef1
am:
17da3761e7
Change-Id: I0ffe18bbcf2105a6a6ceafca84d54e78609dba41
Bill Yi [Wed, 24 Oct 2018 21:48:45 +0000 (14:48 -0700)]
Merge pie-platform-release to aosp-master - DO NOT MERGE
Change-Id: Id9d96121fb33dba3b75b2b5364da997e30006b36
Bill Yi [Wed, 24 Oct 2018 21:06:57 +0000 (14:06 -0700)]
Merge pi-dr1-dev to aosp-master am:
7a2346f7a9
am:
7eb56e1387
Change-Id: I3c747d9fb3c66df71c1fe1a9b85a98e2960ce794
Jack He [Tue, 17 Oct 2017 17:40:38 +0000 (10:40 -0700)]
Add siyuanh@google.com to OWNERS
Test: N/A
Change-Id: I8bdb6e7be8261a25f7ff103a5043001fa7645fee
Jakub Pawlowski [Wed, 24 Oct 2018 16:47:14 +0000 (09:47 -0700)]
Merge "separate btm_ble_stop_auto_conn from btm_ble_start_auto_conn"
am:
da21153044
Change-Id: Id4b539dc8932c5e1eed5af590f393345984e3a93
Jakub Pawlowski [Wed, 24 Oct 2018 16:33:59 +0000 (16:33 +0000)]
Merge "separate btm_ble_stop_auto_conn from btm_ble_start_auto_conn"
Bill Yi [Wed, 24 Oct 2018 16:08:39 +0000 (09:08 -0700)]
Merge pi-platform-release to stage-aosp-master - DO NOT MERGE
Change-Id: I79403acee1a20f77cd6161d2bad1459bf4af71bb
Jakub Pawlowski [Wed, 24 Oct 2018 11:22:40 +0000 (13:22 +0200)]
separate btm_ble_stop_auto_conn from btm_ble_start_auto_conn
There is no common code in those two code paths. Also, minor if/else
refactoring to simplify the code.
Test: compilation, no change in how code works.
Change-Id: I82a03a18041bb5ad396f21ed13e8047e093f2765
Jakub Pawlowski [Wed, 24 Oct 2018 07:04:51 +0000 (00:04 -0700)]
service: don't use android::String16 in platform-independent code
am:
7b00a3b645
Change-Id: Ib5846ed35cc0818aa6724685203888b7fd9496aa
Jakub Pawlowski [Tue, 23 Oct 2018 19:54:53 +0000 (21:54 +0200)]
service: don't use android::String16 in platform-independent code
Test: compile on linux with ninja
Change-Id: Iac421b43a5516418a33b8c804cfca4c777363b27
Chih-Hung Hsieh [Tue, 23 Oct 2018 21:58:28 +0000 (14:58 -0700)]
Allow implicit-fallthrough warnings locally.
am:
c1ae0ab3c5
Change-Id: I091127b9297fd5b0518219805b69a5994b97d660
Chih-Hung Hsieh [Tue, 16 Oct 2018 17:18:13 +0000 (10:18 -0700)]
Allow implicit-fallthrough warnings locally.
It will be a global error by default.
These warnings will be fixed in new refactored code.
Bug:
112564944
Bug:
116020782
Test: make checkbuild
Change-Id: I67f1170f3f7502a4243d8a5641eb471317b42cf4
Exempt-From-Owner-Approval: do not block on new warnings
Stanley Tng [Tue, 23 Oct 2018 19:22:13 +0000 (12:22 -0700)]
[automerger skipped] Fix Spurious Hearing Aid Start and Stop Cmds
am:
cac96c646f -s ours
Change-Id: Ibf50a6c68afa99b6989a2cf8070941e0570ec827
Jakub Pawlowski [Tue, 23 Oct 2018 17:21:01 +0000 (10:21 -0700)]
Fix errors around logging when compiling on Linux
am:
e4f1378d34
Change-Id: I88127a850a6eaa9cf8a390964cf89d7839d37ad8
Jakub Pawlowski [Tue, 23 Oct 2018 12:46:24 +0000 (14:46 +0200)]
Fix errors around logging when compiling on Linux
* cutils/log.h -> log/log.h
* add missing #include "log/log.h"
* add android_errorWriteWithInfoLog stub
Test: compile on linux using ninja
Change-Id: I720921a2fbf86b5ce5e2a2f691f1e769c91672b6
Jakub Pawlowski [Tue, 23 Oct 2018 14:23:18 +0000 (07:23 -0700)]
Partial fix for linux build
am:
292ab25ef1
Change-Id: I73f01e952a85b945356627c40ac941bef31bc2cc
Jakub Pawlowski [Tue, 23 Oct 2018 13:57:20 +0000 (15:57 +0200)]
Partial fix for linux build
Test: build with ninja on Linux
Change-Id: Ibb5bdde117732556b5b7f0fa6fba8a57c2912782
Bill Yi [Fri, 19 Oct 2018 21:52:03 +0000 (14:52 -0700)]
Merge pi-dr1-dev to aosp-master
am:
7a2346f7a9
Change-Id: I3f4ec71151ebc9d388a546e03428261e0d00a70c
Bill Yi [Fri, 19 Oct 2018 19:20:55 +0000 (12:20 -0700)]
Merge pi-dr1-dev to aosp-master
Change-Id: I1670051cca44a5a490b42d07ae9977b01ce093e1
Stanley Tng [Wed, 17 Oct 2018 22:12:58 +0000 (15:12 -0700)]
Fix Spurious Hearing Aid Start and Stop Cmds
Prevent the spurious Start and Stop Commands that are send to the
Hearing Aids when there is audio suspend and resume, and also connection
and disconnections.
Also, make sure that the callback for the Audio Suspend and Resume are
done in the main thread; previously, it was running in the wrong socket
thread.
Lastly, make sure that the Connection Update callback are processed
correctly; previously, we are not checking that the right connection
interval are set and taking the callbacks done by service discovery.
Test: Manual testing with Hearing Aids
Bug:
117619792
Change-Id: I33a175947b0118f0234ec6338c20ac6e7963a598
Merged-In: Ib448992fc0ba5af82c2d117dd65f1abd45d2acb6
wangfukai [Fri, 19 Oct 2018 07:04:04 +0000 (00:04 -0700)]
Merge "AVRCP:Update lidx when ACP handle exist in bta_av_rc_create" am:
a8f9164a7a
am:
3ad2b64795
Change-Id: Ieed677874d9b51eb0bfca1c62f9d05e0a4b47be3
wangfukai [Fri, 19 Oct 2018 06:46:18 +0000 (23:46 -0700)]
Fix typo in avdt_scb_by_hdl am:
da8fdc5ad3
am:
32c62f11a8
Change-Id: I7cfcd424b90e6540f2e85b8313b78c0c48595bb4
wangfukai [Fri, 19 Oct 2018 06:44:53 +0000 (23:44 -0700)]
Merge "AVRCP:Update lidx when ACP handle exist in bta_av_rc_create"
am:
a8f9164a7a
Change-Id: Idcf88f8245cda75a590a5877243eb46dc7af2504
wangfukai [Fri, 19 Oct 2018 06:30:38 +0000 (23:30 -0700)]
Fix typo in avdt_scb_by_hdl
am:
da8fdc5ad3
Change-Id: Ic9a3d2893927387011db15d1c38ee95eaf4862f8
Treehugger Robot [Fri, 19 Oct 2018 03:04:30 +0000 (03:04 +0000)]
Merge "AVRCP:Update lidx when ACP handle exist in bta_av_rc_create"
OSDN Git Service
