summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-03-10am 57ed41b9: Merge "Add NOTICE and MODULE_LICENSE files"HEADmaster-soongmastermainConley Owens
* commit '57ed41b9554aefdb7f881e15375d75b4c9dd58e9': Add NOTICE and MODULE_LICENSE files
2015-03-10Merge "Add NOTICE and MODULE_LICENSE files"Conley Owens
2015-03-09am 0cd5a85e: (-s ours) Merge "Change pairing_cb to assume temporary pairing ↵Natalie Silvanovich
by default" * commit '0cd5a85ee83c1db54fb244300c072ef73c622861': Change pairing_cb to assume temporary pairing by default
2015-03-09Merge "Change pairing_cb to assume temporary pairing by default"Natalie Silvanovich
2015-03-06Add NOTICE and MODULE_LICENSE filesConley Owens
Change-Id: I28284de20a047470e0afc9d4c0b088efe202eaaf
2015-03-06Change pairing_cb to assume temporary pairing by defaultAndre Eisenbach
When pairing takes place, the pairing_cb.is_temp flag indicates whether a pairing is temporary or permanent. Link keys are not stored for temporary pairings. Since this is a "positive" flag, resetting the pairing_cb control block (ex. memset to 0), it will assume persistent pairing by default. Under certain circumstances, this can lead to a link key being stored for temporarily secured connection. This patch reverses the flag to be a "negative" flag. Renamed to "persistent_bond", the default 0 meaning is now used to indicate a temporary bond. If the lag is not properly set now, it will default to a temporary bond and will not save the link key erronously. This fix is for CVE-2014-7914 Bug: 18345373 Change-Id: I6e821595877ff30d64dc6e33602ac049cab3dd1e
2015-03-03am 3e12cd50: Merge "reword channle to channel"Erik Kline
* commit '3e12cd500a06053da91f5cb69837838ea7455067': reword channle to channel
2015-03-03Merge "reword channle to channel"Erik Kline
2015-02-25reword channle to channelErik Kline
Change-Id: Ic45f99db717e1efcad4385cbbe1dd658e3a18bfb
2015-02-19Fix the GCC build after fixing the clang build.Dan Albert
GCC doesn't know this flag, and apparently GCC only actually complains about not knowing the flag if there is at least one warning emitted. Change-Id: Ic63b915d1f111fead46184ccd765d7a79fb531f9
2015-02-19Ignore typdef redefintion warning to fix build.Dan Albert
It redefines to the same type, so not a problem. Change-Id: I6139816f02729573474957528a8ac782243b598b
2015-02-10am dfb3b2f2: Add flag indicating encrypted connections to ↵Andre Eisenbach
btif_dm_get_connection_state() * commit 'dfb3b2f2595dc16fe7f576a4b0c2f5e73db0327f': Add flag indicating encrypted connections to btif_dm_get_connection_state()
2015-02-07am d736b8d6: Merge "Fix some more missing libc includes."Christopher Ferris
* commit 'd736b8d6b3f95b7af19b75a613486b023279c3ee': Fix some more missing libc includes.
2015-02-07Merge "Fix some more missing libc includes."Christopher Ferris
2015-02-06Fix some more missing libc includes.Ian Coolidge
stddef and signal are not pulled in transitively in glibc. Change-Id: I7a834bbdc31ae2aee4cb700a223c1636fda42afa
2015-02-06Add flag indicating encrypted connections to btif_dm_get_connection_state()lollipop-mr1-devAndre Eisenbach
Add a check to btif_dm_get_connection_state() to see if the currently active connection is encrypted. Bug: 19186961 Change-Id: I27bcc6e296d272ffd17c0bbe97631ffa4df57ccd
2015-02-06am d6f2fa93: am d6419cd6: am 0a8c803a: am 7f34538a: (-s ours) am 65aec3a3: ↵Andre Eisenbach
am 6d429d9d: (-s ours) am 3efb9e2e: DO NOT MERGE Change pairing_cb to assume temporary pairing by default * commit 'd6f2fa93052c1d9bdf6035ace6b32345013516db': DO NOT MERGE Change pairing_cb to assume temporary pairing by default
2015-02-06am e791f732: am ae9d174b: am 408dec19: am 977acabd: (-s ours) am eebc8ab9: ↵Andre Eisenbach
DO NOT MERGE Change pairing_cb to assume temporary pairing by default * commit 'e791f73202a2832b4d20dbc1ecd4b520adbb75d3': DO NOT MERGE Change pairing_cb to assume temporary pairing by default
2015-02-06am 0ad6cfde: am ce5ae4ab: am a708936d: DO NOT MERGE Change pairing_cb to ↵Andre Eisenbach
assume temporary pairing by default * commit '0ad6cfdee8857a7bc54d4c3eb98bf1cdc82dc9a7': DO NOT MERGE Change pairing_cb to assume temporary pairing by default
2015-02-05am d6419cd6: am 0a8c803a: am 7f34538a: (-s ours) am 65aec3a3: am 6d429d9d: ↵Andre Eisenbach
(-s ours) am 3efb9e2e: DO NOT MERGE Change pairing_cb to assume temporary pairing by default * commit 'd6419cd6309bd20a2ab095c783bb6ad1f208bf4f': DO NOT MERGE Change pairing_cb to assume temporary pairing by default
2015-02-05am 0a8c803a: am 7f34538a: (-s ours) am 65aec3a3: am 6d429d9d: (-s ours) am ↵Andre Eisenbach
3efb9e2e: DO NOT MERGE Change pairing_cb to assume temporary pairing by default * commit '0a8c803a48fe5afa71d1f8660539012e9b1f9642': DO NOT MERGE Change pairing_cb to assume temporary pairing by default
2015-02-05am 7f34538a: (-s ours) am 65aec3a3: am 6d429d9d: (-s ours) am 3efb9e2e: DO ↵Andre Eisenbach
NOT MERGE Change pairing_cb to assume temporary pairing by default * commit '7f34538ac0e447a88d1f54ff819c28b3574f0aa4': DO NOT MERGE Change pairing_cb to assume temporary pairing by default
2015-02-05am 65aec3a3: am 6d429d9d: (-s ours) am 3efb9e2e: DO NOT MERGE Change ↵Andre Eisenbach
pairing_cb to assume temporary pairing by default * commit '65aec3a3f62c004d7073470f18330007b7ecf230': DO NOT MERGE Change pairing_cb to assume temporary pairing by default
2015-02-05am ae9d174b: am 408dec19: am 977acabd: (-s ours) am eebc8ab9: DO NOT MERGE ↵Andre Eisenbach
Change pairing_cb to assume temporary pairing by default * commit 'ae9d174bc0afe0a7ed0bb4fb82836338fbb6adb1': DO NOT MERGE Change pairing_cb to assume temporary pairing by default
2015-02-05am 408dec19: am 977acabd: (-s ours) am eebc8ab9: DO NOT MERGE Change ↵Andre Eisenbach
pairing_cb to assume temporary pairing by default * commit '408dec1991255be919b1605e5cfe983b7f7154e9': DO NOT MERGE Change pairing_cb to assume temporary pairing by default
2015-02-05am 977acabd: (-s ours) am eebc8ab9: DO NOT MERGE Change pairing_cb to assume ↵Andre Eisenbach
temporary pairing by default * commit '977acabd3744a3308057b1485c7ac8658698e96b': DO NOT MERGE Change pairing_cb to assume temporary pairing by default
2015-02-05am 6d429d9d: (-s ours) am 3efb9e2e: DO NOT MERGE Change pairing_cb to assume ↵Andre Eisenbach
temporary pairing by default * commit '6d429d9d0a1b537600c652dda2bc98d4c4ebd783': DO NOT MERGE Change pairing_cb to assume temporary pairing by default
2015-02-05am eebc8ab9: DO NOT MERGE Change pairing_cb to assume temporary pairing by ↵Andre Eisenbach
default * commit 'eebc8ab9c5e362d721f8f606f0a564ca9aff89d9': DO NOT MERGE Change pairing_cb to assume temporary pairing by default
2015-02-05am 3efb9e2e: DO NOT MERGE Change pairing_cb to assume temporary pairing by ↵Andre Eisenbach
default * commit '3efb9e2e11471a67329ad17d48ffa79118ea76c6': DO NOT MERGE Change pairing_cb to assume temporary pairing by default
2015-02-05am ce5ae4ab: am a708936d: DO NOT MERGE Change pairing_cb to assume temporary ↵Andre Eisenbach
pairing by default * commit 'ce5ae4abddaab8865bb44c83d2d44e14b0d7536b': DO NOT MERGE Change pairing_cb to assume temporary pairing by default
2015-02-05am a708936d: DO NOT MERGE Change pairing_cb to assume temporary pairing by ↵Andre Eisenbach
default * commit 'a708936da347b32f2a0811b5f33d9068c2b0de6f': DO NOT MERGE Change pairing_cb to assume temporary pairing by default
2015-02-04am ff50e75d: Merge "Fix pthread_t confusion."Elliott Hughes
* commit 'ff50e75d69b5cee253c213f91999e8f6f6129c58': Fix pthread_t confusion.
2015-02-04Merge "Fix pthread_t confusion."Elliott Hughes
2015-02-04am 481b0546: Merge "Fix non-standard pthread mutex interactions."Elliott Hughes
* commit '481b0546db69274145ee129d19bb03cce4763c6f': Fix non-standard pthread mutex interactions.
2015-02-04Merge "Fix non-standard pthread mutex interactions."Elliott Hughes
2015-02-03Fix pthread_t confusion.Ian Coolidge
Don't assign pthread_t to pid_t or UINT32. Just use pthread_t throughout. Change-Id: Icb8315c591b4131314c834beebd94f37651eaafb
2015-02-03DO NOT MERGE Change pairing_cb to assume temporary pairing by defaultAndre Eisenbach
When pairing takes place, the pairing_cb.is_temp flag indicates whether a pairing is temporary or permanent. Link keys are not stored for temporary pairings. Since this is a "positive" flag, resetting the pairing_cb control block (ex. memset to 0), it will assume persistent pairing by default. Under certain circumstances, this can lead to a link key being stored for temporarily secured connection. This patch reverses the flag to be a "negative" flag. Renamed to "persistent_bond", the default 0 meaning is now used to indicate a temporary bond. If the lag is not properly set now, it will default to a temporary bond and will not save the link key erronously. Bug: 18345373 Change-Id: I06b1ba9331a70ebc29f4437bf836164658dec5ae
2015-02-03DO NOT MERGE Change pairing_cb to assume temporary pairing by defaultAndre Eisenbach
When pairing takes place, the pairing_cb.is_temp flag indicates whether a pairing is temporary or permanent. Link keys are not stored for temporary pairings. Since this is a "positive" flag, resetting the pairing_cb control block (ex. memset to 0), it will assume persistent pairing by default. Under certain circumstances, this can lead to a link key being stored for temporarily secured connection. This patch reverses the flag to be a "negative" flag. Renamed to "persistent_bond", the default 0 meaning is now used to indicate a temporary bond. If the lag is not properly set now, it will default to a temporary bond and will not save the link key erronously. Bug: 18345373 Change-Id: I8558abc9eace609b1ba02485b0ff775fb6f3c6af
2015-02-03DO NOT MERGE Change pairing_cb to assume temporary pairing by defaultAndre Eisenbach
When pairing takes place, the pairing_cb.is_temp flag indicates whether a pairing is temporary or permanent. Link keys are not stored for temporary pairings. Since this is a "positive" flag, resetting the pairing_cb control block (ex. memset to 0), it will assume persistent pairing by default. Under certain circumstances, this can lead to a link key being stored for temporarily secured connection. This patch reverses the flag to be a "negative" flag. Renamed to "persistent_bond", the default 0 meaning is now used to indicate a temporary bond. If the lag is not properly set now, it will default to a temporary bond and will not save the link key erronously. Bug: 18345373 Change-Id: Ifb61e7a23db07888a625db9ab851548600183136
2015-02-03Fix non-standard pthread mutex interactions.Ian Coolidge
pthread_mutex_t is intended to be opaque. pthread_attr_t is intended to be opaque. Change-Id: I9b4f32b695783a4391851269977aa748dcc4f241
2015-02-03am 1efdda75: Merge "btif_pan: Grab interface declarations from net/if.h only."Elliott Hughes
* commit '1efdda75d0e7cf4223ba8958a56c2aeafa5129c5': btif_pan: Grab interface declarations from net/if.h only.
2015-02-03Merge "btif_pan: Grab interface declarations from net/if.h only."Elliott Hughes
2015-02-02btif_pan: Grab interface declarations from net/if.h only.Ian Coolidge
This is the libc interface file. Using linux/if.h produces definition collisions on glibc.
2015-01-30am a51404cf: Merge "Add missing <string.h> includes."Elliott Hughes
* commit 'a51404cfa0fc6ffb504e76874be32977014c647f': Add missing <string.h> includes.
2015-01-30Merge "Add missing <string.h> includes."Elliott Hughes
2015-01-29Add missing <string.h> includes.Elliott Hughes
Change-Id: Iebebb21a2fd04603e0170d7c3a9f6d9552f39c88
2015-01-30am 17d85406: Merge "bta_dm_search_cancel sends dm_search state machine ↵Prem Kumar
complete events" into lmp-mr1-dev * commit '17d854067162e27c2bf67fd61454ae7b76b79cea': bta_dm_search_cancel sends dm_search state machine complete events
2015-01-30Merge "bta_dm_search_cancel sends dm_search state machine complete events" ↵Prem Kumar
into lmp-mr1-dev
2015-01-29am 61331337: Merge "Add missing includes."Elliott Hughes
* commit '61331337c05cde410665e6a533a338b867fad45c': Add missing includes.
2015-01-29Merge "Add missing includes."Elliott Hughes
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-07 20:32:21 +0000