Commit graph

3964 commits

Author SHA1 Message Date
Pavlin Radoslavov
e865d621a8 Merge "Replace usage of "vector<>" with "std::vector<>"" am: f611c0457d am: ca5a332391 am: e4d6dcb8c5
am: 2b24cf6446

Change-Id: I2de16bdb34536b18eb722420b9c7eeaeaef26920
2016-12-14 00:08:25 +00:00
Pavlin Radoslavov
2b24cf6446 Merge "Replace usage of "vector<>" with "std::vector<>"" am: f611c0457d am: ca5a332391
am: e4d6dcb8c5

Change-Id: If1529cbbc21d654027c08e4d88aadefd582a9f48
2016-12-14 00:01:22 +00:00
TreeHugger Robot
18f20bb7d6 Merge "stub radio HAL: fix default antenna connected state for FM." 2016-12-13 23:58:02 +00:00
Pavlin Radoslavov
e4d6dcb8c5 Merge "Replace usage of "vector<>" with "std::vector<>"" am: f611c0457d
am: ca5a332391

Change-Id: I54edcdc83a3f7cfc074175d11866e45df16b3fca
2016-12-13 23:54:51 +00:00
Pavlin Radoslavov
ca5a332391 Merge "Replace usage of "vector<>" with "std::vector<>""
am: f611c0457d

Change-Id: Id39267e97e8e1448e9fcd9c6811455d9a632c27c
2016-12-13 23:48:51 +00:00
Treehugger Robot
f611c0457d Merge "Replace usage of "vector<>" with "std::vector<>"" 2016-12-13 23:36:45 +00:00
Eric Laurent
de8e013f54 stub radio HAL: fix default antenna connected state for FM.
Bug: 33583729
Change-Id: Ifbd2c95ab34a8faa7d31f4a1b2f28c6d7df38766

Test: build and run broadcast radio VTS
2016-12-13 14:21:51 -08:00
Glenn Kasten
57eaa9bcd8 fifo: add dependency needed after re-implementation of MonoPipe
MonoPipe is being re-implemented on top of FIFO in audio_utils.

Test: builds OK
Change-Id: I42a30c5cc859150c3b9e2b23aad3c9c14c7c341a
2016-12-12 15:54:14 -08:00
Steven Moreland
54925f4636 Ran hardware/interfaces/update-base-files.sh.
Test: pass
Change-Id: Ic29c0dcc0876a522dc6a3693d7c2762bac3aabdf
2016-12-12 09:50:49 -08:00
Pavlin Radoslavov
44d57d4c18 Replace usage of "vector<>" with "std::vector<>"
This change is needed so we can remove the last instances
of "using std::vector" statements in hardware/libhardware.

Test: code compilation
Change-Id: Id728867f6b2e154a01ef56bda93d48def71b0e47
2016-12-09 17:55:30 -08:00
Marie Janssen
67e82dfbab Merge "bluetooth: Remove duplicate function definitions" am: db38221b9b am: 6c990300bb am: d2ac0af43f
am: a5994cb5db

Change-Id: I9f06263c51503742705f30b0e94a7e23fdf72584
2016-12-06 01:29:26 +00:00
Marie Janssen
a5994cb5db Merge "bluetooth: Remove duplicate function definitions" am: db38221b9b am: 6c990300bb
am: d2ac0af43f

Change-Id: Ic405b524faaa69f55eb1e29881afb3d241b7c8ef
2016-12-06 01:24:23 +00:00
Marie Janssen
d2ac0af43f Merge "bluetooth: Remove duplicate function definitions" am: db38221b9b
am: 6c990300bb

Change-Id: Ibe5c935dfaf3f827d03fd7e1b77a16c4908cbcc4
2016-12-06 01:20:23 +00:00
Marie Janssen
6c990300bb Merge "bluetooth: Remove duplicate function definitions"
am: db38221b9b

Change-Id: I3e0c507de5f60fc279e171d19e1776562e4b3d9b
2016-12-06 01:16:52 +00:00
Treehugger Robot
db38221b9b Merge "bluetooth: Remove duplicate function definitions" 2016-12-06 01:10:28 +00:00
Marie Janssen
694efc0efb bluetooth: Remove duplicate function definitions
Test: m -j37
Change-Id: Ib0f596df1f9ccf07531bdb9c2c313936a03166bb
2016-12-05 14:59:45 -08:00
Jakub Pawlowski
bc050c7b27 Merge "BLE OOB Pairing - parse address type (2/5)" into nyc-mr2-dev am: 5e4e9f18e4
am: d167c63fa5

Change-Id: Ia6a23a7883f4abbe7adad6009b02df65d64345be
2016-12-02 22:57:55 +00:00
Jakub Pawlowski
d167c63fa5 Merge "BLE OOB Pairing - parse address type (2/5)" into nyc-mr2-dev
am: 5e4e9f18e4

Change-Id: Ibe9c1b463a9db67ac4e10b711a2c1339b4562401
2016-12-02 22:32:42 +00:00
Jakub Pawlowski
1bdfa140b0 BLE OOB Pairing - parse address type (2/5) am: 93bd76b16a
am: 6bdfc2744c

Change-Id: I3b834dc931c24b74314ed44727bd0052106c5dec
2016-12-02 22:19:30 +00:00
Jakub Pawlowski
6bdfc2744c BLE OOB Pairing - parse address type (2/5)
am: 93bd76b16a

Change-Id: Id4bd387a47a4be9445ff00e4283c16a7dc14a2dd
2016-12-02 22:12:47 +00:00
Jakub Pawlowski
5e4e9f18e4 Merge "BLE OOB Pairing - parse address type (2/5)" into nyc-mr2-dev 2016-12-02 20:14:05 +00:00
Ruchi Kandoi
963a49f2f2 Merge "nfc: Add nfc-base.h" am: 45182ed0e8 am: 8b5e7a4360 am: 94e3a35f8c
am: feeb5d25b1

Change-Id: Ia5c8215b7b3a5fc2517ef072a53511bcbc6f8401
2016-11-30 21:08:57 +00:00
Ruchi Kandoi
feeb5d25b1 Merge "nfc: Add nfc-base.h" am: 45182ed0e8 am: 8b5e7a4360
am: 94e3a35f8c

Change-Id: If2f56d04f99b1f1198ab306a2e72c241b2a8c28d
2016-11-30 21:04:24 +00:00
rago
1214de162b Fix security vulnerability: potential OOB write in audioserver am: 3f9a6d3bd9 am: 28d8817df3 am: 750a6a4ed8 am: 559dbde531 am: 4654f9ab8b am: 4154f08e79 am: 2ebeab8c6b am: c196433170 am: cd6ebe9b27 am: 21c9c6dc69 am: 3110aeafeb am: c5ced57319 am: 66b8752e83 am: ecab7b6547 am: 25dcc1df86
am: 03f67ea9a7

Change-Id: I5b430f09739574ad14f936f5b4d59baf4bd53229
2016-11-30 20:59:10 +00:00
rago
46b37c19fb Fix security vulnerability: potential OOB write in audioserver am: 3f9a6d3bd9 am: 28d8817df3 am: 750a6a4ed8 am: 559dbde531 am: 4654f9ab8b am: 4154f08e79 am: 2ebeab8c6b am: c196433170 am: cd6ebe9b27 am: 21c9c6dc69 am: 3110aeafeb am: c5ced57319 am: 66b8752e83 am: ecab7b6547 am: 17d2ddb4b1
am: f35bf73f5b  -s ours

Change-Id: I9396ac86cd355bee6513671ec33426cdb38dec08
2016-11-30 20:58:32 +00:00
Ruchi Kandoi
94e3a35f8c Merge "nfc: Add nfc-base.h" am: 45182ed0e8
am: 8b5e7a4360

Change-Id: I9c0b545c46f61e5b4c9a7fdf6544d17bca69a0f7
2016-11-30 20:58:25 +00:00
Ruchi Kandoi
8b5e7a4360 Merge "nfc: Add nfc-base.h"
am: 45182ed0e8

Change-Id: I2697a8ba298c77b12d3a398fcfff7c633f7959ab
2016-11-30 20:51:17 +00:00
Ruchi Kandoi
45182ed0e8 Merge "nfc: Add nfc-base.h" 2016-11-30 20:45:03 +00:00
rago
03f67ea9a7 Fix security vulnerability: potential OOB write in audioserver am: 3f9a6d3bd9 am: 28d8817df3 am: 750a6a4ed8 am: 559dbde531 am: 4654f9ab8b am: 4154f08e79 am: 2ebeab8c6b am: c196433170 am: cd6ebe9b27 am: 21c9c6dc69 am: 3110aeafeb am: c5ced57319 am: 66b8752e83 am: ecab7b6547
am: 25dcc1df86

Change-Id: I7b76417adad93f0d35f330f68b5f94ac848a3a29
2016-11-30 20:28:26 +00:00
rago
f35bf73f5b Fix security vulnerability: potential OOB write in audioserver am: 3f9a6d3bd9 am: 28d8817df3 am: 750a6a4ed8 am: 559dbde531 am: 4654f9ab8b am: 4154f08e79 am: 2ebeab8c6b am: c196433170 am: cd6ebe9b27 am: 21c9c6dc69 am: 3110aeafeb am: c5ced57319 am: 66b8752e83 am: ecab7b6547
am: 17d2ddb4b1

Change-Id: Id91b78356328bd3a215e754479a372d0d329eeba
2016-11-30 20:27:29 +00:00
rago
25dcc1df86 Fix security vulnerability: potential OOB write in audioserver am: 3f9a6d3bd9 am: 28d8817df3 am: 750a6a4ed8 am: 559dbde531 am: 4654f9ab8b am: 4154f08e79 am: 2ebeab8c6b am: c196433170 am: cd6ebe9b27 am: 21c9c6dc69 am: 3110aeafeb am: c5ced57319 am: 66b8752e83
am: ecab7b6547

Change-Id: I3fb3598eb11bab1860a55762ba26700bece207aa
2016-11-30 20:21:30 +00:00
rago
17d2ddb4b1 Fix security vulnerability: potential OOB write in audioserver am: 3f9a6d3bd9 am: 28d8817df3 am: 750a6a4ed8 am: 559dbde531 am: 4654f9ab8b am: 4154f08e79 am: 2ebeab8c6b am: c196433170 am: cd6ebe9b27 am: 21c9c6dc69 am: 3110aeafeb am: c5ced57319 am: 66b8752e83
am: ecab7b6547

Change-Id: I510527d895f2b843069bc51e1128f70076f44830
2016-11-30 20:21:29 +00:00
rago
ecab7b6547 Fix security vulnerability: potential OOB write in audioserver am: 3f9a6d3bd9 am: 28d8817df3 am: 750a6a4ed8 am: 559dbde531 am: 4654f9ab8b am: 4154f08e79 am: 2ebeab8c6b am: c196433170 am: cd6ebe9b27 am: 21c9c6dc69 am: 3110aeafeb am: c5ced57319
am: 66b8752e83

Change-Id: I1aa2ef6f03391f9f53630f030b6bbef12e1a019d
2016-11-30 20:16:28 +00:00
rago
66b8752e83 Fix security vulnerability: potential OOB write in audioserver am: 3f9a6d3bd9 am: 28d8817df3 am: 750a6a4ed8 am: 559dbde531 am: 4654f9ab8b am: 4154f08e79 am: 2ebeab8c6b am: c196433170 am: cd6ebe9b27 am: 21c9c6dc69 am: 3110aeafeb
am: c5ced57319

Change-Id: Ie3a728280f0eb897f4cff39f1f97c24d62989f4e
2016-11-30 20:10:57 +00:00
rago
c5ced57319 Fix security vulnerability: potential OOB write in audioserver am: 3f9a6d3bd9 am: 28d8817df3 am: 750a6a4ed8 am: 559dbde531 am: 4654f9ab8b am: 4154f08e79 am: 2ebeab8c6b am: c196433170 am: cd6ebe9b27 am: 21c9c6dc69
am: 3110aeafeb

Change-Id: I5f6830b3d713fa9836065ef4101317f4d17488c2
2016-11-30 20:05:25 +00:00
rago
3110aeafeb Fix security vulnerability: potential OOB write in audioserver am: 3f9a6d3bd9 am: 28d8817df3 am: 750a6a4ed8 am: 559dbde531 am: 4654f9ab8b am: 4154f08e79 am: 2ebeab8c6b am: c196433170 am: cd6ebe9b27
am: 21c9c6dc69

Change-Id: I199ff9b65f50ab98676c4e449fa7cfc1ebb8ec85
2016-11-30 20:00:25 +00:00
rago
21c9c6dc69 Fix security vulnerability: potential OOB write in audioserver am: 3f9a6d3bd9 am: 28d8817df3 am: 750a6a4ed8 am: 559dbde531 am: 4654f9ab8b am: 4154f08e79 am: 2ebeab8c6b am: c196433170
am: cd6ebe9b27

Change-Id: Ia1c55db37373474552543c3a0f4fad7b6305a2a0
2016-11-30 19:55:25 +00:00
rago
cd6ebe9b27 Fix security vulnerability: potential OOB write in audioserver am: 3f9a6d3bd9 am: 28d8817df3 am: 750a6a4ed8 am: 559dbde531 am: 4654f9ab8b am: 4154f08e79 am: 2ebeab8c6b
am: c196433170

Change-Id: Ib2c430673490d56347b7c5719ae9ac222129d046
2016-11-30 19:49:23 +00:00
rago
c196433170 Fix security vulnerability: potential OOB write in audioserver am: 3f9a6d3bd9 am: 28d8817df3 am: 750a6a4ed8 am: 559dbde531 am: 4654f9ab8b am: 4154f08e79
am: 2ebeab8c6b

Change-Id: I8ee48760ca62d1e9002a53694be8f39ff47a7b33
2016-11-30 19:44:52 +00:00
rago
2ebeab8c6b Fix security vulnerability: potential OOB write in audioserver am: 3f9a6d3bd9 am: 28d8817df3 am: 750a6a4ed8 am: 559dbde531 am: 4654f9ab8b
am: 4154f08e79

Change-Id: I810091a4bc2713ec688e01f8656d581018e767dd
2016-11-30 19:38:52 +00:00
rago
4154f08e79 Fix security vulnerability: potential OOB write in audioserver am: 3f9a6d3bd9 am: 28d8817df3 am: 750a6a4ed8 am: 559dbde531
am: 4654f9ab8b

Change-Id: I6b12abacd19b3ac06c054d05c5f381d234756593
2016-11-30 19:34:22 +00:00
rago
4654f9ab8b Fix security vulnerability: potential OOB write in audioserver am: 3f9a6d3bd9 am: 28d8817df3 am: 750a6a4ed8
am: 559dbde531

Change-Id: I800e527ba948c4416aeee1375e909f7da6f42a71
2016-11-30 19:28:51 +00:00
rago
559dbde531 Fix security vulnerability: potential OOB write in audioserver am: 3f9a6d3bd9 am: 28d8817df3
am: 750a6a4ed8

Change-Id: I9254658ce47758df06c15c049d80862e7e774847
2016-11-30 19:23:23 +00:00
rago
750a6a4ed8 Fix security vulnerability: potential OOB write in audioserver am: 3f9a6d3bd9
am: 28d8817df3

Change-Id: Icd0c6917e987c5a5cbb1fb540a4d34e2032d6081
2016-11-30 19:17:50 +00:00
rago
28d8817df3 Fix security vulnerability: potential OOB write in audioserver
am: 3f9a6d3bd9

Change-Id: Ia7aefc3e6e49f9e0105acc5fc816cd8e0bdd9cd9
2016-11-30 19:12:19 +00:00
Ruchi Kandoi
a2e7517215 nfc: Add nfc-base.h
Test: Compiles
Bug: 32748647
Change-Id: I53d1d4b73091920ef1dc32f32ca31b87db5e38c2
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
2016-11-30 18:19:03 +00:00
Sanket Agarwal
d030714360 Merge "Add Bluetooth device address parameter to HF Client APIs" am: a76ae0e511 am: 5a77f325ec am: 282d3240eb
am: 76fe5c9b96

Change-Id: Ic4355cb9e21f23f3a2c959c8171366461f313d23
2016-11-30 01:43:14 +00:00
Sanket Agarwal
76fe5c9b96 Merge "Add Bluetooth device address parameter to HF Client APIs" am: a76ae0e511 am: 5a77f325ec
am: 282d3240eb

Change-Id: I67fb987a436d7efbf54ea3c60dd0a05a23d2aa3d
2016-11-30 01:38:43 +00:00
Sanket Agarwal
282d3240eb Merge "Add Bluetooth device address parameter to HF Client APIs" am: a76ae0e511
am: 5a77f325ec

Change-Id: I60bd11c9c5ea765305b7e2a9b3b2d8afbabf39a7
2016-11-30 01:33:44 +00:00
Sanket Agarwal
5a77f325ec Merge "Add Bluetooth device address parameter to HF Client APIs"
am: a76ae0e511

Change-Id: I199b9cdcd827d09c9c47bd87004d39966e13800f
2016-11-30 01:28:43 +00:00