OSDN Git Service
Stanley Tng [Wed, 21 Nov 2018 21:39:08 +0000 (13:39 -0800)]
Merge "Prevent potential deadlock in Hearing Aids" am:
2fb03d8470
am:
35b7a921bf
Change-Id: I8a93e3fa0d46fd30b4c9f326e08f710002e57722
Benson Li [Wed, 21 Nov 2018 21:23:36 +0000 (13:23 -0800)]
Merge "HFP: Send caller ID in +CLIP command (3/4)" am:
0bcf573d91
am:
763e282d78
Change-Id: Ib878dd4534d9ed2a287273f74cbde6eefc3961d7
Stanley Tng [Wed, 21 Nov 2018 21:03:03 +0000 (13:03 -0800)]
Merge "Prevent potential deadlock in Hearing Aids"
am:
2fb03d8470
Change-Id: Id16264dd2cd55ab730323ed0d95adde1cb88431a
Benson Li [Wed, 21 Nov 2018 20:57:56 +0000 (12:57 -0800)]
Merge "HFP: Send caller ID in +CLIP command (3/4)"
am:
0bcf573d91
Change-Id: Ib4d00ef1e727613a4363226115137f700464fe82
Treehugger Robot [Wed, 21 Nov 2018 20:52:18 +0000 (20:52 +0000)]
Merge "Prevent potential deadlock in Hearing Aids"
Hansong Zhang [Wed, 21 Nov 2018 20:27:43 +0000 (12:27 -0800)]
Merge "btsock_signaled: provide debugging info for crash" am:
f8da780d60
am:
2d53240eda
Change-Id: Idd2d4d993afd0ed276d868e12cff64cf0182da8f
Treehugger Robot [Wed, 21 Nov 2018 20:21:19 +0000 (20:21 +0000)]
Merge "HFP: Send caller ID in +CLIP command (3/4)"
Hansong Zhang [Wed, 21 Nov 2018 20:14:21 +0000 (12:14 -0800)]
Merge "btsock_signaled: provide debugging info for crash"
am:
f8da780d60
Change-Id: Ic7773644aba72a0310c15ae786b14d8fb11e9faf
Treehugger Robot [Wed, 21 Nov 2018 19:51:32 +0000 (19:51 +0000)]
Merge "btsock_signaled: provide debugging info for crash"
Hansong Zhang [Wed, 21 Nov 2018 19:31:53 +0000 (11:31 -0800)]
Merge "btif_av: remove dead code" am:
84f70f1152
am:
fb26bc4127
Change-Id: I0ef00548508eeeebf86d8b1da9c208958e99220d
Hansong Zhang [Wed, 21 Nov 2018 19:26:32 +0000 (11:26 -0800)]
Merge "btif_av: remove dead code"
am:
84f70f1152
Change-Id: I7ffedcf6dd730ff452ff68f1c7ce87ea71832305
Treehugger Robot [Wed, 21 Nov 2018 19:04:36 +0000 (19:04 +0000)]
Merge "btif_av: remove dead code"
Hansong Zhang [Wed, 21 Nov 2018 00:04:18 +0000 (16:04 -0800)]
btif_av: remove dead code
Test: manual
Change-Id: I8b172ec2235ae5847f073f8d50ad71761bc37d02
Stanley Tng [Fri, 16 Nov 2018 19:34:28 +0000 (11:34 -0800)]
Prevent potential deadlock in Hearing Aids
Prevent a potential deadlock when calling the main thread but the main
thread is not running.
Bug:
117619792
Test: Manual test to make sure no regression
Change-Id: I6e001533144827b17b88547671765f790ed771bd
Jakub Pawlowski [Tue, 20 Nov 2018 21:57:09 +0000 (13:57 -0800)]
Merge "Remove unused BTM_BleSetAdvParams" am:
3b12d664e9
am:
f1b809ef0d
Change-Id: Ide0dc43c72f668de67dd3432f03cbfbaab9f6495
Jakub Pawlowski [Tue, 20 Nov 2018 21:27:48 +0000 (13:27 -0800)]
Merge "Remove unused BTM_BleSetAdvParams"
am:
3b12d664e9
Change-Id: Ib265a9a6022765110c2e2c0cd338255863c2cbf5
Jakub Pawlowski [Tue, 20 Nov 2018 21:22:33 +0000 (13:22 -0800)]
Linux tests build fix am:
83db4992e3
am:
c5778df1aa
Change-Id: Ic20678579f60f6064de036f1d71b76e1f1f8a84a
Treehugger Robot [Tue, 20 Nov 2018 21:13:35 +0000 (21:13 +0000)]
Merge "Remove unused BTM_BleSetAdvParams"
Jakub Pawlowski [Tue, 20 Nov 2018 21:09:37 +0000 (13:09 -0800)]
Linux tests build fix
am:
83db4992e3
Change-Id: Ieafc3eb4d4b4834f1475cdae8b5f72d637b49828
Jakub Pawlowski [Tue, 20 Nov 2018 11:14:10 +0000 (12:14 +0100)]
Remove unused BTM_BleSetAdvParams
Test: compilation
Change-Id: I5797a16b3fd92c5ffa1ad1fd048699a591fd1e4c
Jakub Pawlowski [Tue, 20 Nov 2018 18:27:11 +0000 (19:27 +0100)]
Linux tests build fix
Test: compile on Linux using ninja
Change-Id: I180679a7a6f12abe83db0480d9007ebdfdf1d451
Stanley Tng [Fri, 16 Nov 2018 16:24:56 +0000 (08:24 -0800)]
Fix an error in pure virtual function in earlier CL am:
e72c597aa7
am:
bcfa969026
Change-Id: I6e6b3e9ee7a5ba3602858da9ae65174cddbde399
Stanley Tng [Fri, 16 Nov 2018 16:19:51 +0000 (08:19 -0800)]
Fix an error in pure virtual function in earlier CL
am:
e72c597aa7
Change-Id: Ia8c01a258eb3fa2614751055dbef2b0807b20eb5
Stanley Tng [Wed, 7 Nov 2018 20:50:37 +0000 (12:50 -0800)]
Fix an error in pure virtual function in earlier CL
The earlier CL "Fix Spurious Hearing Aid Start and Stop Cmds" is missing
this "=0" to make the virtual function pure. This CL fixes this
oversight.
Test: Compile
Bug:
117619792
Change-Id: Id9e72b8d93f9671c08a613ecb43b4121662770a0
Hansong Zhang [Thu, 15 Nov 2018 23:37:12 +0000 (15:37 -0800)]
btsock_signaled: provide debugging info for crash
Test: manual
Bug:
68108403
Change-Id: I89cfc15787f51594535e1e0c00e7a18a317a5d81
TreeHugger Robot [Thu, 15 Nov 2018 22:52:24 +0000 (22:52 +0000)]
Merge "Continue merge: Fix Spurious Hearing Aid Start and Stop Cmds" into pi-dev-plus-aosp
Jakub Pawlowski [Thu, 15 Nov 2018 07:28:11 +0000 (23:28 -0800)]
Dump gatt::connection_manager state into bugreport am:
8ae68be3b8
am:
eb9d0d3a9b
Change-Id: Iee8c0c1d855c703904632108760689a8a01dd0ff
Jakub Pawlowski [Thu, 15 Nov 2018 07:27:53 +0000 (23:27 -0800)]
Use map instead of list for keeping apps interested in connection am:
c436612cdc
am:
3641f67e0c
Change-Id: I503496425110fec2c7d16ffe2ad938ee221d853e
Jakub Pawlowski [Thu, 15 Nov 2018 07:20:01 +0000 (23:20 -0800)]
Dump gatt::connection_manager state into bugreport
am:
8ae68be3b8
Change-Id: Id19a8a93a055fda21dbb62888fa4db3f442bb4a9
Jakub Pawlowski [Thu, 15 Nov 2018 07:19:49 +0000 (23:19 -0800)]
Use map instead of list for keeping apps interested in connection
am:
c436612cdc
Change-Id: Icd78c19959b2a88a5b1ad6164a09ee35fc77f2ec
Stanley Tng [Sun, 14 Oct 2018 04:17:00 +0000 (21:17 -0700)]
Continue merge: Fix Spurious Hearing Aid Start and Stop Cmds
The original CL from AOSP
(chg-id:I33a175947b0118f0234ec6338c20ac6e7963a598) is not merged into
pi-dev-plus-asop due to some wrong Merged-In and Change-Id tags errors.
This CL is to continue the merge starting at pi-dev-plus-asop.
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
(cherry picked from commit
ff3ed00c79d145e5fa30fcacbfc92c570f1da01d)
Change-Id: Ia95baae132e41690944adf852834ba407bf740a2
Jakub Pawlowski [Tue, 13 Nov 2018 14:41:42 +0000 (15:41 +0100)]
Dump gatt::connection_manager state into bugreport
Knowing what's in the white list is useful for debugging.
Bug:
112827989
Test: adb bugreport, verify content.
Change-Id: I195d1ee2fe277f0f0ef534c73f7a964c5f5e61b6
Jakub Pawlowski [Sat, 10 Nov 2018 15:45:35 +0000 (16:45 +0100)]
Use map instead of list for keeping apps interested in connection
Bug:
112827989
Test: BleGattConnectionManager
Change-Id: I7b7ea608f5e27a9f17141ccec0c5d5c06bb22e60
Jakub Pawlowski [Tue, 13 Nov 2018 13:17:18 +0000 (05:17 -0800)]
First tests for connection management am:
e85bc52264
am:
9091033fdc
Change-Id: Ic36d490606bbb0aa3af3ac18d56dbfb35efc2f6e
Jakub Pawlowski [Tue, 13 Nov 2018 13:13:10 +0000 (05:13 -0800)]
First tests for connection management
am:
e85bc52264
Change-Id: I1127e88d0b2c83eb00e1105af25cfe54ca21d203
Cheney Ni [Tue, 13 Nov 2018 01:40:13 +0000 (17:40 -0800)]
Revert "Fix OOB in avrc_pars_browse_rsp" am:
6d1c4974bf am:
1e5b0037f8 am:
40cbdde492
am:
3c0a7052f7
Change-Id: Iebdbba98bdf571610dace8f5b2d3cc4076a58267
Cheney Ni [Tue, 13 Nov 2018 01:27:42 +0000 (17:27 -0800)]
Revert "Fix OOB in avrc_pars_browse_rsp" am:
6d1c4974bf am:
1e5b0037f8
am:
40cbdde492
Change-Id: Ie709003c0668e1786758b0d17e7459db8f94529a
Cheney Ni [Tue, 13 Nov 2018 01:06:10 +0000 (17:06 -0800)]
Revert "Fix OOB in avrc_pars_browse_rsp" am:
6d1c4974bf
am:
1e5b0037f8
Change-Id: Ibd9afdda7b2f7cc8f895bf9af4cfbd893f3a8bbe
Cheney Ni [Tue, 13 Nov 2018 00:35:58 +0000 (16:35 -0800)]
Revert "Fix OOB in avrc_pars_browse_rsp"
am:
6d1c4974bf
Change-Id: I164343e6a08e851173a730fb06173fd6dca60f03
Jakub Pawlowski [Tue, 13 Nov 2018 00:29:41 +0000 (16:29 -0800)]
introduce gatt::connection_manager::get_apps_connecting_to am:
d1d3088e93
am:
9b8e46352e
Change-Id: Ic2586e09eba7708c8863f2618dad2735778cecf3
Jakub Pawlowski [Mon, 12 Nov 2018 23:36:23 +0000 (15:36 -0800)]
introduce gatt::connection_manager::get_apps_connecting_to
am:
d1d3088e93
Change-Id: Idde98ec3cb082150cd57d7749be5d53c11745379
Jakub Pawlowski [Sat, 10 Nov 2018 13:41:41 +0000 (05:41 -0800)]
Naming cleanup in stack/gatt/connection_manager.* am:
d28727edd4
am:
431791987d
Change-Id: I97f4e48a0edfeb98629e559ac71d735ba7195341
Jakub Pawlowski [Sat, 10 Nov 2018 13:37:14 +0000 (05:37 -0800)]
Naming cleanup in stack/gatt/connection_manager.*
am:
d28727edd4
Change-Id: I73a6d1da304af64c986eba804011e6d9f0d6d4cc
Jakub Pawlowski [Fri, 9 Nov 2018 13:41:01 +0000 (14:41 +0100)]
First tests for connection management
Test: added in this CL
Change-Id: Id3937530e1b0a16c056ae48face78b18c6ec32f0
Jakub Pawlowski [Fri, 9 Nov 2018 17:40:04 +0000 (18:40 +0100)]
introduce gatt::connection_manager::get_apps_connecting_to
This is to clean up the interface, and don't expose internal control
structures.
Test: compilation
Change-Id: Id2afc5efb4c14be0b787cfabbe21fc1961381cb7
Jakub Pawlowski [Fri, 9 Nov 2018 23:06:06 +0000 (15:06 -0800)]
gatt_utils_white_list -> connection_manager am:
ddba8a6243
am:
e1a3f22bd7
Change-Id: Ic5596a7126024ce6c6c37f3753f83f6acc1974a5
Jakub Pawlowski [Fri, 9 Nov 2018 23:01:02 +0000 (15:01 -0800)]
gatt_utils_white_list -> connection_manager
am:
ddba8a6243
Change-Id: I8000a7a5121c61270a7ea6cb24b48cec5ee1f09d
Jakub Pawlowski [Fri, 9 Nov 2018 11:42:32 +0000 (12:42 +0100)]
Naming cleanup in stack/gatt/connection_manager.*
Test: compilation
Change-Id: Ic73632cb258515856b9ae5616ec47881b4b28c61
Jakub Pawlowski [Fri, 9 Nov 2018 10:53:11 +0000 (11:53 +0100)]
gatt_utils_white_list -> connection_manager
Test: compilation
Change-Id: Ib6741ddd8332ff70efd47a8ede0176d887743ff4
Ajay Panicker [Fri, 9 Nov 2018 03:11:40 +0000 (19:11 -0800)]
Merge "AVRCP: Change notification variable when the interim response is sent" am:
62cd940292
am:
5ecac9b8e5
Change-Id: Iea6a4b8261b0a90cdc85904ddb2e9b0312cfb8da
Ajay Panicker [Fri, 9 Nov 2018 03:06:59 +0000 (19:06 -0800)]
Merge "AVRCP: Change notification variable when the interim response is sent"
am:
62cd940292
Change-Id: I11061ce6fb36be8cac793ad93cd0d502eed9734d
Treehugger Robot [Fri, 9 Nov 2018 02:57:12 +0000 (02:57 +0000)]
Merge "AVRCP: Change notification variable when the interim response is sent"
weichinweng [Fri, 9 Nov 2018 00:42:21 +0000 (16:42 -0800)]
[automerger skipped] Merge "Hearing Aid: Combine audio from stereo to mono when only one side connect" into pi-dev
am:
ac6a9f95b3 -s ours
Change-Id: I421bfc5a38d47b34f44f7dbdd4157787485432c7
TreeHugger Robot [Fri, 9 Nov 2018 00:27:36 +0000 (00:27 +0000)]
Merge "Hearing Aid: Combine audio from stereo to mono when only one side connect" into pi-dev
Ajay Panicker [Tue, 26 Jun 2018 21:52:56 +0000 (14:52 -0700)]
AVRCP: Change notification variable when the interim response is sent
This avoids the possibility of having a changed notification be sent
before an interim response is sent when the AVRCP service has to wait
for a response from the media layer for information regarding the
notification.
Also fix the PlayPosition test for AVRCP as it was testing for play
state correctness.
Bug:
109588762
Test: Run host test net_test_avrcp
Change-Id: Icb7bb1068191ecf2a2e390854084b6b9b47537fa
(cherry picked from commit
2d87908fe8825245dcc2e1dbde027331f1e2371d)
Cheney Ni [Thu, 8 Nov 2018 18:56:07 +0000 (18:56 +0000)]
Revert "Fix OOB in avrc_pars_browse_rsp"
This reverts commit
32a33dc12d4a9b21306510a98bcd039ca3be1dd3.
Reason for revert: regression issue found.
Change-Id: I48db0b0313477e1f3b6fe97cd4d540dfe16f3963
Bug:
111451066
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
Bug:
116317072
Test: disconnected/reconnected one side hearing when play stereo test
sound.
Change-Id: Idb3871951617680aba3ca82f801a70c95403d889
Merged-In: Idb3871951617680aba3ca82f801a70c95403d889
Jakub Pawlowski [Thu, 8 Nov 2018 23:41:38 +0000 (15:41 -0800)]
Minor style fixes in gatt_main.cc am:
b5629de6ed
am:
4872b155e4
Change-Id: Iddae08e7095a80f3a0edd168a88020de9ddd0933
Jakub Pawlowski [Thu, 8 Nov 2018 23:25:56 +0000 (15:25 -0800)]
Minor style fixes in gatt_main.cc
am:
b5629de6ed
Change-Id: I26d6290ccfe93ab38329dfb84560b8722804d57f
Jakub Pawlowski [Thu, 8 Nov 2018 18:54:49 +0000 (19:54 +0100)]
Minor style fixes in gatt_main.cc
Test: compilation
Change-Id: I446b9e83603e7224abe1eddd030b4502cc7dceb5
Ajay Panicker [Thu, 8 Nov 2018 22:27:51 +0000 (14:27 -0800)]
Merge "Add code coverage report support to Bluetooth" am:
d533096b1b
am:
c916abccf0
Change-Id: Iabd851fece3ca68fe3dcd468ffcd73b666fe4ebe
Ajay Panicker [Thu, 8 Nov 2018 22:18:37 +0000 (14:18 -0800)]
Merge "Add code coverage report support to Bluetooth"
am:
d533096b1b
Change-Id: I4980643d5443389bb04e14fd93fdf3941a7d3b19
Treehugger Robot [Thu, 8 Nov 2018 22:02:48 +0000 (22:02 +0000)]
Merge "Add code coverage report support to Bluetooth"
weichinweng [Thu, 8 Nov 2018 08:54:36 +0000 (00:54 -0800)]
Merge "HFP: Don't use mSBC for HF devices not supporting related feature" am:
c5931e67b4
am:
50192a91ae
Change-Id: I58a54079702d787ce62a7744b73aefd947d9c96b
weichinweng [Thu, 8 Nov 2018 08:50:27 +0000 (00:50 -0800)]
Merge "HFP: Don't use mSBC for HF devices not supporting related feature"
am:
c5931e67b4
Change-Id: Ic9969ea693f9912f12917186c921cdccdba085ab
Benson Li [Tue, 17 Jul 2018 10:05:16 +0000 (18:05 +0800)]
HFP: Send caller ID in +CLIP command (3/4)
* Append caller display name in ag_reslut data if there is name in
CALL_STATE_INCOMING state
* Process all clip data and store the formatted string to ag_result
data
Bug:
111378831
Test: runtest bluetooth, runtest -x BluetoothPhoneServiceTest.java
Change-Id: Ief48ed9cb5e0b32274624a90799ab9922dbd656e
Treehugger Robot [Thu, 8 Nov 2018 08:43:27 +0000 (08:43 +0000)]
Merge "HFP: Don't use mSBC for HF devices not supporting related feature"
Stanley Tng [Wed, 7 Nov 2018 23:53:04 +0000 (15:53 -0800)]
[automerger skipped] Fix Spurious Hearing Aid Start and Stop Cmds am:
ff3ed00c79
am:
da4c3cf3d7 -s ours
Change-Id: If7bd552fcbb250cdc94b3b50304f3c7d65a6f9f1
Stanley Tng [Wed, 7 Nov 2018 23:47:05 +0000 (15:47 -0800)]
Fix Spurious Hearing Aid Start and Stop Cmds
am:
ff3ed00c79
Change-Id: I14199a18d6d89385c23188e265703f5dc4d12189
Stanley Tng [Sun, 14 Oct 2018 04:17:00 +0000 (21:17 -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: I33a175947b0118f0234ec6338c20ac6e7963a598
(cherry picked from commit
cac96c646fac463a9c894ad702bd4428863c9400)
Ajay Panicker [Wed, 7 Nov 2018 03:06:54 +0000 (19:06 -0800)]
Merge "AVRCP: Change notification variable when the interim response is sent" into pi-dev
am:
ae04da547f
Change-Id: I8a6dc602c4aa58b462f46440a91804aa2dd202ff
TreeHugger Robot [Wed, 7 Nov 2018 03:01:13 +0000 (03:01 +0000)]
Merge "AVRCP: Change notification variable when the interim response is sent" into pi-dev
Chienyuan [Mon, 5 Nov 2018 21:55:29 +0000 (13:55 -0800)]
[automerger skipped] Merge "DO NOT MERGE HFP: Check AT command buffer boundary during parsing" into oc-dev am:
6bc3fa5698 am:
2a2dc33454 -s ours am:
efa804ed44 -s ours
am:
6a27baad58 -s ours
Change-Id: I95f0f3cba36d2b5f292e4f869aff97c7ce1daf32
Chienyuan [Mon, 5 Nov 2018 21:49:27 +0000 (13:49 -0800)]
[automerger skipped] Merge "DO NOT MERGE HFP: Check AT command buffer boundary during parsing" into oc-dev am:
6bc3fa5698 am:
2a2dc33454 -s ours
am:
efa804ed44 -s ours
Change-Id: I107e96c3cbeb1f3afd3c60663669aa46c05acae7
Chienyuan [Mon, 5 Nov 2018 21:45:40 +0000 (13:45 -0800)]
[automerger skipped] Merge "DO NOT MERGE HFP: Check AT command buffer boundary during parsing" into oc-dev am:
6bc3fa5698
am:
2a2dc33454 -s ours
Change-Id: I37f850ba7d3361dc801f80188137e23d63f1d2dd
Chienyuan [Mon, 5 Nov 2018 21:38:46 +0000 (13:38 -0800)]
Merge "DO NOT MERGE HFP: Check AT command buffer boundary during parsing" into oc-dev
am:
6bc3fa5698
Change-Id: Ib0f1f4d80313b20e2db2233b0766dfdf887f7bb3
TreeHugger Robot [Mon, 5 Nov 2018 21:32:27 +0000 (21:32 +0000)]
Merge "DO NOT MERGE HFP: Check AT command buffer boundary during parsing" into oc-dev
Hansong Zhang [Mon, 5 Nov 2018 21:29:22 +0000 (13:29 -0800)]
Merge "HFP: Check AT command buffer boundary during parsing" into pi-dev
am:
c3b078c4e6
Change-Id: If4f2565ac0574f5fd2f35a74a3b2f1e59d2990a4
Hansong Zhang [Mon, 5 Nov 2018 21:18:49 +0000 (21:18 +0000)]
Merge "HFP: Check AT command buffer boundary during parsing" into pi-dev
Ajay Panicker [Thu, 20 Sep 2018 21:39:00 +0000 (14:39 -0700)]
Add code coverage report support to Bluetooth
Allow the generation of code coverage reports for any code that has
native tests.
In order to add coverage support to code do the following steps.
1. Add "clang_file_coverage" as a default to the source library(s) you
want statistics for.
2. Add "clang_coverage_bin" as a default to the host supported test.
3. Add the test name and the files you want covered to "gen_coverage.py"
- The files covered can either be a directory or files.
- Avoid using / at the beginning of a covered file/dir as this
breaks how the coverage generator resolves filenames.
Bug:
114751344
Test: run ./gen_coverage.py and test arguments manually
Change-Id: I9dd04f6ee2fd642531e301e3bfd52713f862cd4b
Myles Watson [Mon, 5 Nov 2018 19:36:27 +0000 (11:36 -0800)]
[automerger skipped] Merge "DO NOT MERGE: SDP: Check p_end in save_attr_seq and add_attr" into oc-dev am:
f90160ea4f -s ours am:
d2e1ff8307 -s ours am:
4e8ad23c80 -s ours
am:
11338dee1e -s ours
Change-Id: I22616892e5c59fc86621752111fb739b219b75d0
Myles Watson [Mon, 5 Nov 2018 19:32:05 +0000 (11:32 -0800)]
[automerger skipped] Merge "DO NOT MERGE: SDP: Check p_end in save_attr_seq and add_attr" into oc-dev am:
f90160ea4f -s ours am:
d2e1ff8307 -s ours
am:
4e8ad23c80 -s ours
Change-Id: I3ecb8639e74cbd720ffa5ee547e77c6898091907
Myles Watson [Mon, 5 Nov 2018 19:26:17 +0000 (11:26 -0800)]
[automerger skipped] Merge "DO NOT MERGE: SDP: Check p_end in save_attr_seq and add_attr" into oc-dev am:
f90160ea4f -s ours
am:
d2e1ff8307 -s ours
Change-Id: Id3fec3163877efd920bf6883c4c1dbc108bdce75
Myles Watson [Mon, 5 Nov 2018 19:22:43 +0000 (11:22 -0800)]
[automerger skipped] Merge "DO NOT MERGE: SDP: Check p_end in save_attr_seq and add_attr" into oc-dev
am:
f90160ea4f -s ours
Change-Id: Ibfd89fac51bc174eb75f144f623c59b8f290c655
TreeHugger Robot [Mon, 5 Nov 2018 19:06:20 +0000 (19:06 +0000)]
Merge "DO NOT MERGE: SDP: Check p_end in save_attr_seq and add_attr" into oc-dev
Chienyuan [Mon, 5 Nov 2018 18:37:50 +0000 (10:37 -0800)]
[automerger skipped] DO NOT MERGE HFP: Check AT command buffer boundary during parsing skipped:
163dec2ae1 skipped:
9805ed7a7a skipped:
f9606e1d89 skipped:
c96313fb2c skipped:
9c2fb57cee am:
18515721e5 -s ours am:
6408abcd83 -s ours am:
bfe3eda2bb -s ours
am:
970d51348b -s ours
Change-Id: Ia4e18e0261f1162136674bd9bfa0dd3c27cd9fbc
Chienyuan [Mon, 5 Nov 2018 18:33:22 +0000 (10:33 -0800)]
[automerger skipped] DO NOT MERGE HFP: Check AT command buffer boundary during parsing skipped:
163dec2ae1 skipped:
9805ed7a7a skipped:
f9606e1d89 skipped:
c96313fb2c skipped:
9c2fb57cee am:
18515721e5 -s ours am:
6408abcd83 -s ours
am:
bfe3eda2bb -s ours
Change-Id: Iab0493279298a450a5b4f223249abbf34d6dc069
Chienyuan [Mon, 5 Nov 2018 18:28:38 +0000 (10:28 -0800)]
[automerger skipped] DO NOT MERGE HFP: Check AT command buffer boundary during parsing skipped:
163dec2ae1 skipped:
9805ed7a7a skipped:
f9606e1d89 skipped:
c96313fb2c skipped:
9c2fb57cee am:
18515721e5 -s ours
am:
6408abcd83 -s ours
Change-Id: Iff25af63698a6a502b0cae09d16b54072b33ffbd
Chienyuan [Mon, 5 Nov 2018 18:24:35 +0000 (10:24 -0800)]
[automerger skipped] DO NOT MERGE HFP: Check AT command buffer boundary during parsing skipped:
163dec2ae1 skipped:
9805ed7a7a skipped:
f9606e1d89 skipped:
c96313fb2c skipped:
9c2fb57cee
am:
18515721e5 -s ours
Change-Id: I5b428c6b8ed1cd08d03a5f3c76f46a7211f2077d
Chienyuan [Mon, 5 Nov 2018 18:04:19 +0000 (10:04 -0800)]
[automerger skipped] Merge "DO NOT MERGE HFP: Check AT command buffer boundary during parsing" into oc-mr1-dev am:
cfaf7a9792 -s ours
am:
76e509cbd4
Change-Id: Idf4b42277f636cba77e5012b19a4b7657af30e7b
Android Build Merger (Role) [Mon, 5 Nov 2018 18:01:29 +0000 (18:01 +0000)]
[automerger skipped] DO NOT MERGE HFP: Check AT command buffer boundary during parsing skipped:
163dec2ae1 skipped:
9805ed7a7a skipped:
f9606e1d89 skipped:
c96313fb2c skipped:
9c2fb57cee
Change-Id: I9bb69caded703f74c79189f0cf78069e1fab9ca5
Android Build Merger (Role) [Mon, 5 Nov 2018 18:01:28 +0000 (18:01 +0000)]
[automerger skipped] DO NOT MERGE HFP: Check AT command buffer boundary during parsing skipped:
163dec2ae1 skipped:
9805ed7a7a skipped:
f9606e1d89 skipped:
c96313fb2c
Change-Id: I29b39b9cd2b0390289b525bf50ce4080b4a9557a
Android Build Merger (Role) [Mon, 5 Nov 2018 18:01:27 +0000 (18:01 +0000)]
[automerger skipped] DO NOT MERGE HFP: Check AT command buffer boundary during parsing skipped:
163dec2ae1 skipped:
9805ed7a7a skipped:
f9606e1d89
Change-Id: Iee0814f1ed5a5decc214abad4721a84825cd53b1
Android Build Merger (Role) [Mon, 5 Nov 2018 18:01:26 +0000 (18:01 +0000)]
[automerger skipped] DO NOT MERGE HFP: Check AT command buffer boundary during parsing skipped:
163dec2ae1 skipped:
9805ed7a7a
Change-Id: I5977408e04b4479c9aa2b5d16a03e18d7e9deced
Android Build Merger (Role) [Mon, 5 Nov 2018 18:01:25 +0000 (18:01 +0000)]
[automerger skipped] DO NOT MERGE HFP: Check AT command buffer boundary during parsing skipped:
163dec2ae1
Change-Id: I406dd66fa46d18b70d48faedf810d6a3ddbe3fbc
Chienyuan [Mon, 5 Nov 2018 17:59:04 +0000 (09:59 -0800)]
[automerger skipped] Merge "DO NOT MERGE HFP: Check AT command buffer boundary during parsing" into oc-mr1-dev
am:
cfaf7a9792 -s ours
Change-Id: Ie772fff1acf9c3b9d0d8eeaecdfe0f4cb9586461
TreeHugger Robot [Mon, 5 Nov 2018 17:50:52 +0000 (17:50 +0000)]
Merge "DO NOT MERGE HFP: Check AT command buffer boundary during parsing" into oc-mr1-dev
Myles Watson [Mon, 5 Nov 2018 17:46:47 +0000 (09:46 -0800)]
[automerger skipped] Merge "DO NOT MERGE: HH: Check parameter length in bta_hh_ctrl_dat_act" into oc-dev am:
f6dc20ea52 am:
0e1c94b72d am:
a8fcbbcc01 -s ours
am:
a0b485d88a
Change-Id: Ia82d1d5895fb8cd616f2471614dbc4937d393f05
Myles Watson [Mon, 5 Nov 2018 17:46:17 +0000 (09:46 -0800)]
Merge changes from topic "am-
154171ba-0805-48c6-88cf-
c592ee3cf37c" into oc-dev am:
518c50aaa9 am:
e476de0364 am:
999d3d078f
am:
efc63ede47
Change-Id: I890071dd0148a04a715b130e48b3f22a9fdb629f
Myles Watson [Mon, 5 Nov 2018 17:42:56 +0000 (09:42 -0800)]
[automerger skipped] Merge "DO NOT MERGE: HH: Check parameter length in bta_hh_ctrl_dat_act" into oc-dev am:
f6dc20ea52 am:
0e1c94b72d
am:
a8fcbbcc01 -s ours
Change-Id: I7c85a561273b60e3419b7ce493bafa7f0a39f6dc
OSDN Git Service
